13 files changed, 114 insertions, 34 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 )
diff --git a/kmicromail/defines.h b/kmicromail/defines.h
index f2d7265..c890def 100644
--- a/kmicromail/defines.h
+++ b/kmicromail/defines.h
@@ -2,9 +2,9 @@
 #define DEFINE_CONSTANTS_H
 
 
 
-#define USER_AGENT          "KMicroMail v1.92"
+#define USER_AGENT          "KOpieMail v1.9.11"
 
 #define PIXMAP_IMAPFOLDER   SmallIcon ( "imapfolder" )
 #define PIXMAP_POP3FOLDER   SmallIcon ( "pop3folder" )
 #define PIXMAP_INBOXFOLDER  SmallIcon ( "inbox" )
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index c931e45..0d30097 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -1,8 +1,9 @@
 
+#include <qdialog.h>
+#include "kapplication.h"
 #include "defines.h"
 #include "editaccounts.h"
-#include "kapplication.h"
 /* OPIE */
 #include <qpe/qpeapplication.h>
 
 /* QT */
diff --git a/kmicromail/kmicromail.pro b/kmicromail/kmicromail.pro
index cd5a3c1..927dc8a 100644
--- a/kmicromail/kmicromail.pro
+++ b/kmicromail/kmicromail.pro
@@ -14,8 +14,9 @@ HEADERS         = defines.h \
                statuswidget.h \
                newmaildir.h \
                selectstore.h \
                selectsmtp.h \
+               ./qpe/qdialog.h \
                nntpgroups.h \
                koprefs.h \
                koprefsdialog.h \
                nntpgroupsdlg.h
@@ -53,9 +54,9 @@ INTERFACES     = editaccountsui.ui \
                selectstoreui.ui \
                nntpgroupsui.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
 
 DESTDIR= ../bin
 TARGET       = ompi
diff --git a/kmicromail/koprefsdialog.cpp b/kmicromail/koprefsdialog.cpp
index 598d12f..c878fc9 100644
--- a/kmicromail/koprefsdialog.cpp
+++ b/kmicromail/koprefsdialog.cpp
@@ -19,9 +19,9 @@
     As a special exception, permission is given to link this program
     with any edition of Qt, and distribute the resulting executable,
     without including the source code for Qt in the source distribution.
 */
-
+#include <kdialog.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qgroupbox.h>
 #include <qbuttongroup.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
@@ -34,14 +34,15 @@ SOURCES         = imapwrapper.cpp \
                mhwrapper.cpp \
               nntpwrapper.cpp \
               generatemail.cpp \
               storemail.cpp \
+               ./qpe/qdialog_hacked.cpp \
                ../qpe/global.cpp
 
 INTERFACES     = logindialogui.ui \
               sendmailprogressui.ui
 
-INCLUDEPATH +=  .. ../../microkde ../../microkde/kdecore ../libetpan/include 
+INCLUDEPATH +=  ../qpe .. ../../microkde ../../microkde/kdecore ../libetpan/include 
 LIBS        +=   -lssl -lcrypto
 
 #-lqpe -letpan
 
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index b19dbbe..7655385 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -4,9 +4,9 @@
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
-#include <kdialog.h>
+//#include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
 #ifdef DESKTOP_VERSION
diff --git a/kmicromail/nntpgroupsdlg.cpp b/kmicromail/nntpgroupsdlg.cpp
index a461bdf..f564b10 100644
--- a/kmicromail/nntpgroupsdlg.cpp
+++ b/kmicromail/nntpgroupsdlg.cpp
@@ -6,9 +6,9 @@
 
 #include <qlayout.h>
 
 NNTPGroupsDlg::NNTPGroupsDlg(NNTPaccount *account,QWidget * parent, const char * name)
-    : QDialog(parent,name,true,WStyle_ContextHelp)
+    : QDialog(parent,name,true,0)
 {
     setCaption(i18n("Subscribed newsgroups"));
     m_Account = account;
     QVBoxLayout*dlglayout = new QVBoxLayout(this);
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 153c7c0..e088b9e 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,7 +1,13 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 // 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"
 #include "editaccounts.h"
 #include "composemail.h"
@@ -9,17 +15,14 @@
 #include "viewmail.h"
 #include "selectstore.h"
 #include "selectsmtp.h"
 #include "accountitem.h"
-#include "koprefsdialog.h"
 #include "klocale.h"
 
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qcursor.h>
 #include <qregexp.h>
-#include <libkdepim/externalapphandler.h>
-#include <libkdepim/kpimglobalprefs.h>
 
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #else
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,20 +1,26 @@
 // 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 */
@@ -24,11 +30,8 @@
 #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;
 
@@ -512,9 +515,9 @@ 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);
     dlglayout->setSpacing(2);
     dlglayout->setMargin(1);
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index c42577e..194ac8e 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -3,9 +3,9 @@
 
 #include "viewmailbase.h"
 #include <libmailwrapper/mailtypes.h>
 
-#include <kdialog.h>
+#include <qdialog.h>
 
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
@@ -71,9 +71,9 @@ private:
     // 0 to 1 cc 2 bcc
     QMap <int,QStringList> m_mail2;
 };
 
-class MailImageDlg:public KDialog
+class MailImageDlg:public QDialog
 {
     Q_OBJECT
 public:
     MailImageDlg(const QString&,QWidget *parent = 0, const char *name = 0, bool modal = true, WFlags f = 0);