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/viewmailbase.cpp | |
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/viewmailbase.cpp | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/kmicromail/viewmailbase.cpp b/kmicromail/viewmailbase.cpp index 3bb964e..371ee91 100644 --- a/kmicromail/viewmailbase.cpp +++ b/kmicromail/viewmailbase.cpp | |||
@@ -1,13 +1,16 @@ | |||
1 | // CHANGED 2004-08-06 Lutz Rogowski | 1 | // CHANGED 2004-08-06 Lutz Rogowski |
2 | #include <qtextbrowser.h> | 2 | #include <q3textbrowser.h> |
3 | #include <qlistview.h> | 3 | #include <q3listview.h> |
4 | #include <qaction.h> | 4 | #include <qaction.h> |
5 | #include <qlabel.h> | 5 | #include <qlabel.h> |
6 | #include <qvbox.h> | 6 | #include <q3vbox.h> |
7 | #include <qapplication.h> | 7 | #include <qapplication.h> |
8 | 8 | ||
9 | #include <qtoolbar.h> | 9 | #include <q3toolbar.h> |
10 | #include <qmenubar.h> | 10 | #include <qmenubar.h> |
11 | //Added by qt3to4: | ||
12 | #include <QKeyEvent> | ||
13 | #include <Q3PopupMenu> | ||
11 | #include <kiconloader.h> | 14 | #include <kiconloader.h> |
12 | //#include <qpe/resource.h> | 15 | //#include <qpe/resource.h> |
13 | #include <klocale.h> | 16 | #include <klocale.h> |
@@ -15,15 +18,15 @@ | |||
15 | #include "viewmailbase.h" | 18 | #include "viewmailbase.h" |
16 | //#include "opendiag.h" | 19 | //#include "opendiag.h" |
17 | 20 | ||
18 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | 21 | ViewMailBase::ViewMailBase(QWidget *parent, const char *name, Qt::WFlags fl) |
19 | : QMainWindow(parent, name, fl) | 22 | : Q3MainWindow(parent, name, fl) |
20 | { | 23 | { |
21 | 24 | ||
22 | setToolBarsMovable(false); | 25 | setToolBarsMovable(false); |
23 | 26 | ||
24 | toolbar = new QToolBar(this); | 27 | toolbar = new Q3ToolBar(this); |
25 | menubar = new QMenuBar( toolbar ); | 28 | menubar = new QMenuBar( toolbar ); |
26 | mailmenu = new QPopupMenu( menubar ); | 29 | mailmenu = new Q3PopupMenu( menubar ); |
27 | menubar->insertItem( i18n( "Mail" ), mailmenu ); | 30 | menubar->insertItem( i18n( "Mail" ), mailmenu ); |
28 | 31 | ||
29 | toolbar->setHorizontalStretchable(true); | 32 | toolbar->setHorizontalStretchable(true); |
@@ -69,10 +72,10 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
69 | toolbar->setStretchableWidget(spacer); | 72 | toolbar->setStretchableWidget(spacer); |
70 | closeMail->addTo(toolbar); | 73 | closeMail->addTo(toolbar); |
71 | closeMail->addTo(mailmenu); | 74 | closeMail->addTo(mailmenu); |
72 | QVBox *view = new QVBox(this); | 75 | Q3VBox *view = new Q3VBox(this); |
73 | setCentralWidget(view); | 76 | setCentralWidget(view); |
74 | 77 | ||
75 | attachments = new QListView(view); | 78 | attachments = new Q3ListView(view); |
76 | int fixh = 100; | 79 | int fixh = 100; |
77 | if ( QApplication::desktop()->width() > 320 ) | 80 | if ( QApplication::desktop()->width() > 320 ) |
78 | fixh = 200; | 81 | fixh = 200; |
@@ -85,7 +88,7 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
85 | attachments->setSorting(-1); | 88 | attachments->setSorting(-1); |
86 | attachments->hide(); | 89 | attachments->hide(); |
87 | 90 | ||
88 | browser = new QTextBrowser(view); | 91 | browser = new Q3TextBrowser(view); |
89 | 92 | ||
90 | //openDiag = new OpenDiag(view); | 93 | //openDiag = new OpenDiag(view); |
91 | //openDiag->hide(); | 94 | //openDiag->hide(); |