author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /kmicromail/qpe | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | kmicromail/qpe/qdialog.h | 2 | ||||
-rw-r--r-- | kmicromail/qpe/qdialog_hacked.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kmicromail/qpe/qdialog.h b/kmicromail/qpe/qdialog.h index c63133d..3720182 100644 --- a/kmicromail/qpe/qdialog.h +++ b/kmicromail/qpe/qdialog.h | |||
@@ -1,29 +1,29 @@ | |||
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 a compiling error | 8 | #warning if you get a compiling error |
9 | #warning please adjust your path here! | 9 | #warning please adjust your path here! |
10 | 10 | ||
11 | #include "/usr/local/qt/include/qdialog.h" | 11 | #include "/usr/local/qt/include/qdialog.h" |
12 | class QDialog_hacked : public QDialog | 12 | class QDialog_hacked : public QDialog |
13 | { | 13 | { |
14 | //Q__OBJECT | 14 | //Q__OBJECT |
15 | 15 | ||
16 | public: | 16 | public: |
17 | 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, Qt::WFlags f=0 ); |
18 | 18 | ||
19 | }; | 19 | }; |
20 | 20 | ||
21 | #define QDialog QDialog_hacked | 21 | #define QDialog QDialog_hacked |
22 | 22 | ||
23 | #endif | 23 | #endif |
24 | 24 | ||
25 | #else | 25 | #else |
26 | #warning "/usr/local/qt/include/qdialog.h" for KDialog | 26 | #warning "/usr/local/qt/include/qdialog.h" for KDialog |
27 | #include "/usr/local/qt/include/qdialog.h" | 27 | #include "/usr/local/qt/include/qdialog.h" |
28 | 28 | ||
29 | #endif | 29 | #endif |
diff --git a/kmicromail/qpe/qdialog_hacked.cpp b/kmicromail/qpe/qdialog_hacked.cpp index 0a34cec..5d4d353 100644 --- a/kmicromail/qpe/qdialog_hacked.cpp +++ b/kmicromail/qpe/qdialog_hacked.cpp | |||
@@ -1,27 +1,27 @@ | |||
1 | 1 | ||
2 | #include <qdialog.h> | 2 | #include <qdialog.h> |
3 | #include <qhbox.h> | 3 | #include <q3hbox.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, Qt::WFlags f ) |
10 | : QDialog( parent,name,modal, f) | 10 | : QDialog( parent,name,modal, f) |
11 | { | 11 | { |
12 | qDebug("New hacked QDialog for ompi desktop"); | 12 | qDebug("New hacked QDialog for ompi desktop"); |
13 | //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) ); | 13 | //QTimer::singleShot( 1, this,SLOT(addaddbuttons()) ); |
14 | 14 | ||
15 | setOrientation ( Vertical ); | 15 | setOrientation ( Vertical ); |
16 | QHBox * hb = new QHBox ( this ); | 16 | Q3HBox * hb = new Q3HBox ( this ); |
17 | QPushButton *ok = new QPushButton( i18n("OK"), hb ); | 17 | QPushButton *ok = new QPushButton( i18n("OK"), hb ); |
18 | QPushButton *cancel = new QPushButton( i18n("Cancel"), hb ); | 18 | QPushButton *cancel = new QPushButton( i18n("Cancel"), hb ); |
19 | setExtension ( hb ); | 19 | setExtension ( hb ); |
20 | showExtension ( true ); | 20 | showExtension ( true ); |
21 | connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) ); | 21 | connect ( ok, SIGNAL ( clicked()),this, SLOT (accept() ) ); |
22 | connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); | 22 | connect ( cancel, SIGNAL ( clicked()),this, SLOT (reject() ) ); |
23 | //setWFlags(WStyle_MinMax ); | 23 | //setWFlags(WStyle_MinMax ); |
24 | 24 | ||
25 | } | 25 | } |
26 | 26 | ||
27 | 27 | ||