summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--kmicromail/composemail.cpp26
-rw-r--r--kmicromail/defines.h2
-rw-r--r--kmicromail/editaccounts.cpp3
-rw-r--r--kmicromail/kmicromail.pro3
-rw-r--r--kmicromail/koprefsdialog.cpp2
-rw-r--r--kmicromail/libmailwrapper/libmailwrapper.pro3
-rw-r--r--kmicromail/mainwindow.cpp2
-rw-r--r--kmicromail/nntpgroupsdlg.cpp2
-rw-r--r--kmicromail/opiemail.cpp9
-rw-r--r--kmicromail/qpe/qdialog.h35
-rw-r--r--kmicromail/qpe/qdialog_hacked.cpp30
-rw-r--r--kmicromail/viewmail.cpp27
-rw-r--r--kmicromail/viewmail.h4
-rw-r--r--microkde/kapplication.h3
-rw-r--r--microkde/microkde.pro6
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
@@ -2,2 +2,18 @@
+#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"
@@ -28,12 +44,2 @@
#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"
diff --git a/kmicromail/defines.h b/kmicromail/defines.h
index f2d7265..c890def 100644
--- a/kmicromail/defines.h
+++ b/kmicromail/defines.h
@@ -5,3 +5,3 @@
-#define USER_AGENT "KMicroMail v1.92"
+#define USER_AGENT "KOpieMail v1.9.11"
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index c931e45..0d30097 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -1,5 +1,6 @@
+#include <qdialog.h>
+#include "kapplication.h"
#include "defines.h"
#include "editaccounts.h"
-#include "kapplication.h"
/* OPIE */
diff --git a/kmicromail/kmicromail.pro b/kmicromail/kmicromail.pro
index cd5a3c1..927dc8a 100644
--- a/kmicromail/kmicromail.pro
+++ b/kmicromail/kmicromail.pro
@@ -17,2 +17,3 @@ HEADERS = defines.h \
selectsmtp.h \
+ ./qpe/qdialog.h \
nntpgroups.h \
@@ -56,3 +57,3 @@ 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
@@ -22,3 +22,3 @@
*/
-
+#include <kdialog.h>
#include <qlayout.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
@@ -37,2 +37,3 @@ SOURCES = imapwrapper.cpp \
storemail.cpp \
+ ./qpe/qdialog_hacked.cpp \
../qpe/global.cpp
@@ -42,3 +43,3 @@ INTERFACES = logindialogui.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
@@ -7,3 +7,3 @@
#include <qlayout.h>
-#include <kdialog.h>
+//#include <kdialog.h>
#include <kiconloader.h>
diff --git a/kmicromail/nntpgroupsdlg.cpp b/kmicromail/nntpgroupsdlg.cpp
index a461bdf..f564b10 100644
--- a/kmicromail/nntpgroupsdlg.cpp
+++ b/kmicromail/nntpgroupsdlg.cpp
@@ -9,3 +9,3 @@
NNTPGroupsDlg::NNTPGroupsDlg(NNTPaccount *account,QWidget * parent, const char * name)
- : QDialog(parent,name,true,WStyle_ContextHelp)
+ : QDialog(parent,name,true,0)
{
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 153c7c0..e088b9e 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -3,2 +3,8 @@
+#include "koprefsdialog.h"
+#include <libkdepim/externalapphandler.h>
+#include <libkdepim/kpimglobalprefs.h>
+#ifdef MINIKDE_KDIALOG_H
+#undef MINIKDE_KDIALOG_H
+#endif
#include "settingsdialog.h"
@@ -12,3 +18,2 @@
#include "accountitem.h"
-#include "koprefsdialog.h"
#include "klocale.h"
@@ -19,4 +24,2 @@
#include <qregexp.h>
-#include <libkdepim/externalapphandler.h>
-#include <libkdepim/kpimglobalprefs.h>
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,2 +1,15 @@
// 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"
@@ -7,11 +20,4 @@
#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>
@@ -27,5 +33,2 @@
#include <qlayout.h>
-#include "koprefs.h"
-#include <klocale.h>
-#include <kglobal.h>
@@ -515,3 +518,3 @@ 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)
{
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index c42577e..194ac8e 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -6,3 +6,3 @@
-#include <kdialog.h>
+#include <qdialog.h>
@@ -74,3 +74,3 @@ private:
-class MailImageDlg:public KDialog
+class MailImageDlg:public QDialog
{
diff --git a/microkde/kapplication.h b/microkde/kapplication.h
index 41546a0..497ec2f 100644
--- a/microkde/kapplication.h
+++ b/microkde/kapplication.h
@@ -5,2 +5,5 @@
#include <qdialog.h>
+#ifdef QDialog
+#undef QDialog
+#endif
diff --git a/microkde/microkde.pro b/microkde/microkde.pro
index 6e75442..c58e184 100644
--- a/microkde/microkde.pro
+++ b/microkde/microkde.pro
@@ -60,4 +60,2 @@ KDGanttMinimizeSplitter.h \
kurl.h \
-oprocctrl.h \
-oprocess.h \
osmartpointer.h \
@@ -176,4 +174,2 @@ KDGanttMinimizeSplitter.cpp \
kdecore/klibloader.cpp \
- kidmanager.cpp \
-oprocctrl.cpp \
-oprocess.cpp
+ kidmanager.cpp