summaryrefslogtreecommitdiffabout
path: root/kmicromail/composemail.cpp
authorzautrix <zautrix>2004-10-30 15:56:24 (UTC)
committer zautrix <zautrix>2004-10-30 15:56:24 (UTC)
commitc8662dc632987a317386b923e24acb9507859528 (patch) (side-by-side diff)
tree97ca9b266d075c3c0f2689769829c453f8118cd8 /kmicromail/composemail.cpp
parent632b43950f1ac2980c281eb8901d797deb0ba971 (diff)
downloadkdepimpi-c8662dc632987a317386b923e24acb9507859528.zip
kdepimpi-c8662dc632987a317386b923e24acb9507859528.tar.gz
kdepimpi-c8662dc632987a317386b923e24acb9507859528.tar.bz2
ompi desktop compile hack
Diffstat (limited to 'kmicromail/composemail.cpp') (more/less context) (show whitespace changes)
-rw-r--r--kmicromail/composemail.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 0cd0b23..5945b7f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -1,6 +1,22 @@
// CHANGED 2004-08-06 Lutz Rogowski
+#include <kabc/addresseedialog.h>
+#include <kabc/stdaddressbook.h>
+#include <kabc/addressee.h>
+#ifdef DESKTOP_VERSION
+#include <qapplication.h>
+#include <kabc/addresseedialog.h>
+#endif //DESKTOP_VERSION
+#include <libkdepim/externalapphandler.h>
+
+#include "koprefs.h"
+
+#ifdef MINIKDE_KDIALOG_H
+#undef MINIKDE_KDIALOG_H
+#endif
+
+
#include "composemail.h"
#include <libmailwrapper/smtpwrapper.h>
#include <libmailwrapper/storemail.h>
@@ -25,18 +41,8 @@
#include <qmultilineedit.h>
#include <qlabel.h>
#include <qtabwidget.h>
#include <qlistview.h>
-#include <kabc/addresseedialog.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/addressee.h>
-#ifdef DESKTOP_VERSION
-#include <qapplication.h>
-#include <kabc/addresseedialog.h>
-#endif //DESKTOP_VERSION
-#include <libkdepim/externalapphandler.h>
-
-#include "koprefs.h"
//using namespace Opie::Core;
//using namespace Opie::Ui;
ComposeMail::ComposeMail( Settings *s, QWidget *parent, const char *name, bool modal )