-rw-r--r-- | kmicromail/viewmail.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp index 0b4c322..f1e0225 100644 --- a/kmicromail/viewmail.cpp +++ b/kmicromail/viewmail.cpp @@ -1,36 +1,39 @@ // CHANGED 2004-08-06 Lutz Rogowski + + + +#include <kfiledialog.h> +#include "koprefs.h" +#include <klocale.h> +#include <kglobal.h> +#include <kapplication.h> + +#ifdef MINIKDE_KDIALOG_H +#undef MINIKDE_KDIALOG_H +#endif + #include "composemail.h" #include "viewmail.h" #include <libmailwrapper/settings.h> #include <libmailwrapper/abstractmail.h> #include <libmailwrapper/mailtypes.h> -#include <kapplication.h> - -/* OPIE */ -//#include <opie2/odebug.h> -//#include <opie2/ofiledialog.h> -//#include <opie2/oimagescrollview.h> -#include <kfiledialog.h> -#include <kdialog.h> +#include <qdialog.h> #include <qpe/qpeapplication.h> /* QT */ #include <qtextbrowser.h> #include <qmessagebox.h> #include <qtextstream.h> #include <qaction.h> #include <qpopupmenu.h> #include <qfile.h> #include <qlayout.h> -#include "koprefs.h" -#include <klocale.h> -#include <kglobal.h> //using namespace Opie::Ui; //using namespace Opie::Core; AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, const QString&fsize,int num,const QValueList<int>&path) @@ -510,13 +513,13 @@ void ViewMail::slotDeleteMail( ) hide(); deleted = true; } } MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, WFlags f) - : KDialog(parent,name,modal) + : QDialog(parent,name,modal) { QVBoxLayout*dlglayout = new QVBoxLayout(this); dlglayout->setSpacing(2); dlglayout->setMargin(1); //m_imageview = new Opie::MM::OImageScrollView(this); //dlglayout->addWidget(m_imageview); |