15 files changed, 118 insertions, 39 deletions

diff --git a/kmicromail/composemail.cpp b/kmicromail/composemail.cpp
index 0cd0b23..5945b7f 100644
--- a/kmicromail/composemail.cpp
+++ b/kmicromail/composemail.cpp
@@ -1,4 +1,20 @@
 // 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"
 
@@ -27,14 +43,4 @@
 #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;
diff --git a/kmicromail/defines.h b/kmicromail/defines.h
index f2d7265..c890def 100644
--- a/kmicromail/defines.h
+++ b/kmicromail/defines.h
@@ -4,5 +4,5 @@
 
 
-#define USER_AGENT          "KMicroMail v1.92"
+#define USER_AGENT          "KOpieMail v1.9.11"
 
 #define PIXMAP_IMAPFOLDER   SmallIcon ( "imapfolder" )
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index c931e45..0d30097 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -1,6 +1,7 @@
 
+#include <qdialog.h>
+#include "kapplication.h"
 #include "defines.h"
 #include "editaccounts.h"
-#include "kapplication.h"
 /* OPIE */
 #include <qpe/qpeapplication.h>
diff --git a/kmicromail/kmicromail.pro b/kmicromail/kmicromail.pro
index cd5a3c1..927dc8a 100644
--- a/kmicromail/kmicromail.pro
+++ b/kmicromail/kmicromail.pro
@@ -16,4 +16,5 @@ HEADERS         = defines.h \
                selectstore.h \
                selectsmtp.h \
+               ./qpe/qdialog.h \
                nntpgroups.h \
                koprefs.h \
@@ -55,5 +56,5 @@ INTERFACES     = editaccountsui.ui \
 
 
-INCLUDEPATH += . .. ../libkdepim   ../microkde ../microkde/kdecore libetpan/include ../microkde/kdeui
+INCLUDEPATH += ./qpe . .. ../libkdepim   ../microkde ../microkde/kdecore libetpan/include ../microkde/kdeui
 LIBS        +=  -L../bin -lmicromailwrapper  -lmicrolibetpan  -lmicrokde  -lssl -lcrypto  -lmicrokdepim -lmicrokabc
 
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 598d12f..c878fc9 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -21,5 +21,5 @@
     without including the source code for Qt in the source distribution.
 */
-
+#include <kdialog.h>
 #include <qlayout.h>
 #include <qlabel.h>
diff --git a/kmicromail/libmailwrapper/libmailwrapper.pro b/kmicromail/libmailwrapper/libmailwrapper.pro
index 2b005d8..10d45b1 100644
--- a/kmicromail/libmailwrapper/libmailwrapper.pro
+++ b/kmicromail/libmailwrapper/libmailwrapper.pro
@@ -36,4 +36,5 @@ SOURCES         = imapwrapper.cpp \
               generatemail.cpp \
               storemail.cpp \
+               ./qpe/qdialog_hacked.cpp \
                ../qpe/global.cpp
 
@@ -41,5 +42,5 @@ INTERFACES     = logindialogui.ui \
               sendmailprogressui.ui
 
-INCLUDEPATH +=  .. ../../microkde ../../microkde/kdecore ../libetpan/include 
+INCLUDEPATH +=  ../qpe .. ../../microkde ../../microkde/kdecore ../libetpan/include 
 LIBS        +=   -lssl -lcrypto
 
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index b19dbbe..7655385 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -6,5 +6,5 @@
 #include <qtimer.h>
 #include <qlayout.h>
-#include <kdialog.h>
+//#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
diff --git a/kmicromail/nntpgroupsdlg.cpp b/kmicromail/nntpgroupsdlg.cpp
index a461bdf..f564b10 100644
--- a/kmicromail/nntpgroupsdlg.cpp
+++ b/kmicromail/nntpgroupsdlg.cpp
@@ -8,5 +8,5 @@
 
 NNTPGroupsDlg::NNTPGroupsDlg(NNTPaccount *account,QWidget * parent, const char * name)
-    : QDialog(parent,name,true,WStyle_ContextHelp)
+    : QDialog(parent,name,true,0)
 {
     setCaption(i18n("Subscribed newsgroups"));
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 153c7c0..e088b9e 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -2,4 +2,10 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 
+#include "koprefsdialog.h"
+#include <libkdepim/externalapphandler.h>
+#include <libkdepim/kpimglobalprefs.h>
+#ifdef  MINIKDE_KDIALOG_H
+#undef MINIKDE_KDIALOG_H
+#endif
 #include "settingsdialog.h"
 #include "opiemail.h"
@@ -11,5 +17,4 @@
 #include "selectsmtp.h"
 #include "accountitem.h"
-#include "koprefsdialog.h"
 #include "klocale.h"
 
@@ -18,6 +23,4 @@
 #include <qcursor.h>
 #include <qregexp.h>
-#include <libkdepim/externalapphandler.h>
-#include <libkdepim/kpimglobalprefs.h>
 
 #ifdef DESKTOP_VERSION
diff --git a/kmicromail/qpe/qdialog.h b/kmicromail/qpe/qdialog.h
new file mode 100644
index 0000000..d671e34
--- a/dev/null
+++ b/kmicromail/qpe/qdialog.h
@@ -0,0 +1,35 @@
+
+#ifndef MINIKDE_KDIALOG_H
+
+#ifndef DEFINE_QDIALOG_HACK
+#define DEFINE_QDIALOG_HACK
+#warning call of include <qdialog.h>
+#warning including /usr/local/qt/include/qdialog.h
+#warning if you get an compiling error please adjust your path her
+
+#include "/usr/local/qt/include/qdialog.h"
+class QDialog_hacked : public QDialog
+{
+    //Q__OBJECT
+
+ public:
+    QDialog_hacked ( QWidget * parent=0, const char * name=0, bool modal=true, WFlags f=0 );
+    
+};
+
+#define QDialog QDialog_hacked
+
+#endif
+
+#else
+#warning ******************************************
+#warning ******************************************
+#warning ******************************************
+#warning ******************************************
+#warning ******************************************
+#warning ******************************************
+#warning ******************************************
+#warning ******************************************
+#include "/usr/local/qt/include/qdialog.h"
+
+#endif
diff --git a/kmicromail/qpe/qdialog_hacked.cpp b/kmicromail/qpe/qdialog_hacked.cpp
new file mode 100644
index 0000000..e2ce21a
--- a/dev/null
+++ b/kmicromail/qpe/qdialog_hacked.cpp
@@ -0,0 +1,30 @@
+
+#include <qdialog.h>
+#include <qhbox.h>
+#include <qpushbutton.h>
+#include <klocale.h>
+#ifdef QDialog
+#undef QDialog
+#endif
+    QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f ) 
+        :  QDialog(  parent,name,modal)
+        {
+            qDebug("******************** ");
+            qDebug("******************** ");
+            qDebug("******************** ");
+            qDebug("******************** ");
+            qDebug("New hacked QDialog == KDialogBase ");
+            //QTimer::singleShot(  1, this,SLOT(addaddbuttons()) );
+
+            setOrientation ( Vertical ); 
+            QHBox * hb = new QHBox ( this );
+            QPushButton *ok = new QPushButton( i18n("OK"), hb );
+            QPushButton *cancel = new QPushButton( i18n("Cancel"), hb );
+            setExtension ( hb );
+            showExtension ( true );
+            connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) );
+            connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) );
+
+        }
+      
+
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 0b4c322..f1e0225 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -1,3 +1,16 @@
 // 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"
@@ -6,13 +19,6 @@
 #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>
@@ -26,7 +32,4 @@
 #include <qfile.h>
 #include <qlayout.h>
-#include "koprefs.h"
-#include <klocale.h>
-#include <kglobal.h>
 
 //using namespace Opie::Ui;
@@ -514,5 +517,5 @@ void ViewMail::slotDeleteMail( )
 
 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);
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index c42577e..194ac8e 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -5,5 +5,5 @@
 #include <libmailwrapper/mailtypes.h>
 
-#include <kdialog.h>
+#include <qdialog.h>
 
 #include <qlistview.h>
@@ -73,5 +73,5 @@ private:
 };
 
-class MailImageDlg:public KDialog
+class MailImageDlg:public QDialog
 {
     Q_OBJECT
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 41546a0..497ec2f 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -4,4 +4,7 @@
 #include "qstring.h"
 #include <qdialog.h>
+#ifdef QDialog 
+#undef  QDialog 
+#endif
 
 class KApplication
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 6e75442..c58e184 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -59,6 +59,4 @@ KDGanttMinimizeSplitter.h \
  kunload.h \
  kurl.h \
-oprocctrl.h \   
-oprocess.h \   
 osmartpointer.h \   
  kdeui/kguiitem.h \
@@ -175,5 +173,3 @@ KDGanttMinimizeSplitter.cpp \
  kdecore/kprefs.cpp \
  kdecore/klibloader.cpp \
- kidmanager.cpp   \
-oprocctrl.cpp \   
-oprocess.cpp 
+ kidmanager.cpp