-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 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | |||
3 | |||
4 | |||
5 | #include <kfiledialog.h> | ||
6 | #include "koprefs.h" | ||
7 | #include <klocale.h> | ||
8 | #include <kglobal.h> | ||
9 | #include <kapplication.h> | ||
10 | |||
11 | #ifdef MINIKDE_KDIALOG_H | ||
12 | #undef MINIKDE_KDIALOG_H | ||
13 | #endif | ||
14 | |||
2 | #include "composemail.h" | 15 | #include "composemail.h" |
3 | #include "viewmail.h" | 16 | #include "viewmail.h" |
4 | 17 | ||
5 | #include <libmailwrapper/settings.h> | 18 | #include <libmailwrapper/settings.h> |
6 | #include <libmailwrapper/abstractmail.h> | 19 | #include <libmailwrapper/abstractmail.h> |
7 | #include <libmailwrapper/mailtypes.h> | 20 | #include <libmailwrapper/mailtypes.h> |
8 | #include <kapplication.h> | ||
9 | |||
10 | /* OPIE */ | ||
11 | //#include <opie2/odebug.h> | ||
12 | //#include <opie2/ofiledialog.h> | ||
13 | //#include <opie2/oimagescrollview.h> | ||
14 | 21 | ||
15 | #include <kfiledialog.h> | 22 | #include <qdialog.h> |
16 | #include <kdialog.h> | ||
17 | 23 | ||
18 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
19 | 25 | ||
20 | /* QT */ | 26 | /* QT */ |
21 | #include <qtextbrowser.h> | 27 | #include <qtextbrowser.h> |
22 | #include <qmessagebox.h> | 28 | #include <qmessagebox.h> |
23 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
24 | #include <qaction.h> | 30 | #include <qaction.h> |
25 | #include <qpopupmenu.h> | 31 | #include <qpopupmenu.h> |
26 | #include <qfile.h> | 32 | #include <qfile.h> |
27 | #include <qlayout.h> | 33 | #include <qlayout.h> |
28 | #include "koprefs.h" | ||
29 | #include <klocale.h> | ||
30 | #include <kglobal.h> | ||
31 | 34 | ||
32 | //using namespace Opie::Ui; | 35 | //using namespace Opie::Ui; |
33 | //using namespace Opie::Core; | 36 | //using namespace Opie::Core; |
34 | 37 | ||
35 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, | 38 | AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file, |
36 | const QString&fsize,int num,const QValueList<int>&path) | 39 | const QString&fsize,int num,const QValueList<int>&path) |
@@ -510,13 +513,13 @@ void ViewMail::slotDeleteMail( ) | |||
510 | hide(); | 513 | hide(); |
511 | deleted = true; | 514 | deleted = true; |
512 | } | 515 | } |
513 | } | 516 | } |
514 | 517 | ||
515 | MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, WFlags f) | 518 | MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, WFlags f) |
516 | : KDialog(parent,name,modal) | 519 | : QDialog(parent,name,modal) |
517 | { | 520 | { |
518 | QVBoxLayout*dlglayout = new QVBoxLayout(this); | 521 | QVBoxLayout*dlglayout = new QVBoxLayout(this); |
519 | dlglayout->setSpacing(2); | 522 | dlglayout->setSpacing(2); |
520 | dlglayout->setMargin(1); | 523 | dlglayout->setMargin(1); |
521 | //m_imageview = new Opie::MM::OImageScrollView(this); | 524 | //m_imageview = new Opie::MM::OImageScrollView(this); |
522 | //dlglayout->addWidget(m_imageview); | 525 | //dlglayout->addWidget(m_imageview); |