author | zautrix <zautrix> | 2004-10-30 17:07:04 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-30 17:07:04 (UTC) |
commit | 28df10a0eb5ff343191755a06391bc6ce2fd84b0 (patch) (unidiff) | |
tree | 930882e7400006887d68fd434939e3a376b8631b /kmicromail/qpe | |
parent | c8662dc632987a317386b923e24acb9507859528 (diff) | |
download | kdepimpi-28df10a0eb5ff343191755a06391bc6ce2fd84b0.zip kdepimpi-28df10a0eb5ff343191755a06391bc6ce2fd84b0.tar.gz kdepimpi-28df10a0eb5ff343191755a06391bc6ce2fd84b0.tar.bz2 |
ompi fixes
-rw-r--r-- | kmicromail/qpe/qdialog.h | 8 | ||||
-rw-r--r-- | kmicromail/qpe/qdialog_hacked.cpp | 5 |
2 files changed, 6 insertions, 7 deletions
diff --git a/kmicromail/qpe/qdialog.h b/kmicromail/qpe/qdialog.h index d671e34..aafdf80 100644 --- a/kmicromail/qpe/qdialog.h +++ b/kmicromail/qpe/qdialog.h | |||
@@ -1,35 +1,33 @@ | |||
1 | 1 | ||
2 | #ifndef MINIKDE_KDIALOG_H | 2 | #ifndef MINIKDE_KDIALOG_H |
3 | 3 | ||
4 | #ifndef DEFINE_QDIALOG_HACK | 4 | #ifndef DEFINE_QDIALOG_HACK |
5 | #define DEFINE_QDIALOG_HACK | 5 | #define DEFINE_QDIALOG_HACK |
6 | #warning call of include <qdialog.h> | 6 | #warning call of include <qdialog.h> |
7 | #warning including /usr/local/qt/include/qdialog.h | 7 | #warning including /usr/local/qt/include/qdialog.h |
8 | #warning if you get an compiling error please adjust your path her | 8 | #warning if you get a compiling error |
9 | #warning please adjust your path here! | ||
9 | 10 | ||
10 | #include "/usr/local/qt/include/qdialog.h" | 11 | #include "/usr/local/qt/include/qdialog.h" |
11 | class QDialog_hacked : public QDialog | 12 | class QDialog_hacked : public QDialog |
12 | { | 13 | { |
13 | //Q__OBJECT | 14 | //Q__OBJECT |
14 | 15 | ||
15 | public: | 16 | public: |
16 | QDialog_hacked ( QWidget * parent=0, const char * name=0, bool modal=true, WFlags f=0 ); | 17 | QDialog_hacked ( QWidget * parent=0, const char * name=0, bool modal=true, WFlags f=0 ); |
17 | 18 | ||
18 | }; | 19 | }; |
19 | 20 | ||
20 | #define QDialog QDialog_hacked | 21 | #define QDialog QDialog_hacked |
21 | 22 | ||
22 | #endif | 23 | #endif |
23 | 24 | ||
24 | #else | 25 | #else |
25 | #warning ****************************************** | 26 | #warning ****************************************** |
26 | #warning ****************************************** | 27 | #warning ****************************************** |
27 | #warning ****************************************** | 28 | #warning ****************************************** |
28 | #warning ****************************************** | 29 | #warning ****************************************** |
29 | #warning ****************************************** | 30 | #warning "/usr/local/qt/include/qdialog.h" for KDialog |
30 | #warning ****************************************** | ||
31 | #warning ****************************************** | ||
32 | #warning ****************************************** | ||
33 | #include "/usr/local/qt/include/qdialog.h" | 31 | #include "/usr/local/qt/include/qdialog.h" |
34 | 32 | ||
35 | #endif | 33 | #endif |
diff --git a/kmicromail/qpe/qdialog_hacked.cpp b/kmicromail/qpe/qdialog_hacked.cpp index e2ce21a..3669312 100644 --- a/kmicromail/qpe/qdialog_hacked.cpp +++ b/kmicromail/qpe/qdialog_hacked.cpp | |||
@@ -1,30 +1,31 @@ | |||
1 | 1 | ||
2 | #include <qdialog.h> | 2 | #include <qdialog.h> |
3 | #include <qhbox.h> | 3 | #include <qhbox.h> |
4 | #include <qpushbutton.h> | 4 | #include <qpushbutton.h> |
5 | #include <klocale.h> | 5 | #include <klocale.h> |
6 | #ifdef QDialog | 6 | #ifdef QDialog |
7 | #undef QDialog | 7 | #undef QDialog |
8 | #endif | 8 | #endif |
9 | QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f ) | 9 | QDialog_hacked::QDialog_hacked ( QWidget * parent, const char * name, bool modal, WFlags f ) |
10 | : QDialog( parent,name,modal) | 10 | : QDialog( parent,name,modal, f) |
11 | { | 11 | { |
12 | qDebug("******************** "); | 12 | qDebug("******************** "); |
13 | qDebug("******************** "); | 13 | qDebug("******************** "); |
14 | qDebug("******************** "); | 14 | qDebug("******************** "); |
15 | qDebug("******************** "); | 15 | qDebug("******************** "); |
16 | qDebug("New hacked QDialog == KDialogBase "); | 16 | qDebug("New hacked QDialog for ompi "); |
17 | //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) ); | 17 | //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) ); |
18 | 18 | ||
19 | setOrientation ( Vertical ); | 19 | setOrientation ( Vertical ); |
20 | QHBox * hb = new QHBox ( this ); | 20 | QHBox * hb = new QHBox ( this ); |
21 | QPushButton *ok = new QPushButton( i18n("OK"), hb ); | 21 | QPushButton *ok = new QPushButton( i18n("OK"), hb ); |
22 | QPushButton *cancel = new QPushButton( i18n("Cancel"), hb ); | 22 | QPushButton *cancel = new QPushButton( i18n("Cancel"), hb ); |
23 | setExtension ( hb ); | 23 | setExtension ( hb ); |
24 | showExtension ( true ); | 24 | showExtension ( true ); |
25 | connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) ); | 25 | connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) ); |
26 | connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); | 26 | connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); |
27 | //setWFlags(WStyle_MinMax ); | ||
27 | 28 | ||
28 | } | 29 | } |
29 | 30 | ||
30 | 31 | ||