-rw-r--r-- | noncore/unsupported/filebrowser/filebrowser.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.cpp | 6 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/viewmailbase.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/viewmailbase.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 12 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.h | 10 | ||||
-rw-r--r-- | noncore/unsupported/qpdf/qpdf.cpp | 2 |
10 files changed, 28 insertions, 28 deletions
diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp index 114ebfa..8cf8a60 100644 --- a/noncore/unsupported/filebrowser/filebrowser.cpp +++ b/noncore/unsupported/filebrowser/filebrowser.cpp | |||
@@ -35,7 +35,7 @@ | |||
35 | #include <qdir.h> | 35 | #include <qdir.h> |
36 | #include <qregexp.h> | 36 | #include <qregexp.h> |
37 | #include <qheader.h> | 37 | #include <qheader.h> |
38 | #include <qpe/qpetoolbar.h> | 38 | #include <qtoolbar.h> |
39 | #include <qpopupmenu.h> | 39 | #include <qpopupmenu.h> |
40 | #include <qmenubar.h> | 40 | #include <qmenubar.h> |
41 | #include <qaction.h> | 41 | #include <qaction.h> |
@@ -839,7 +839,7 @@ void FileBrowser::init(const QString & dir) | |||
839 | setCentralWidget( fileView ); | 839 | setCentralWidget( fileView ); |
840 | setToolBarsMovable( FALSE ); | 840 | setToolBarsMovable( FALSE ); |
841 | 841 | ||
842 | QPEToolBar* toolBar = new QPEToolBar( this ); | 842 | QToolBar* toolBar = new QToolBar( this ); |
843 | toolBar->setHorizontalStretchable( TRUE ); | 843 | toolBar->setHorizontalStretchable( TRUE ); |
844 | 844 | ||
845 | QMenuBar* menuBar = new QMenuBar( toolBar ); | 845 | QMenuBar* menuBar = new QMenuBar( toolBar ); |
@@ -869,7 +869,7 @@ void FileBrowser::init(const QString & dir) | |||
869 | 869 | ||
870 | menuBar->insertItem( tr("View"), viewMenu ); | 870 | menuBar->insertItem( tr("View"), viewMenu ); |
871 | 871 | ||
872 | toolBar = new QPEToolBar( this ); | 872 | toolBar = new QToolBar( this ); |
873 | 873 | ||
874 | lastAction = new QAction( tr("Previous dir"), Resource::loadIconSet( "back" ), | 874 | lastAction = new QAction( tr("Previous dir"), Resource::loadIconSet( "back" ), |
875 | QString::null, 0, this, 0 ); | 875 | QString::null, 0, this, 0 ); |
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp index 34d6eb6..94de15c 100644 --- a/noncore/unsupported/mail2/composerbase.cpp +++ b/noncore/unsupported/mail2/composerbase.cpp | |||
@@ -8,7 +8,7 @@ | |||
8 | #include <qvbox.h> | 8 | #include <qvbox.h> |
9 | 9 | ||
10 | #include <qpe/qpetoolbar.h> | 10 | #include <qpe/qpetoolbar.h> |
11 | #include <qpe/qpemenubar.h> | 11 | #include <qmenubar.h> |
12 | #include <qpe/resource.h> | 12 | #include <qpe/resource.h> |
13 | 13 | ||
14 | #include "mailstatusbar.h" | 14 | #include "mailstatusbar.h" |
@@ -21,7 +21,7 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
21 | setCaption(tr("Compose Message")); | 21 | setCaption(tr("Compose Message")); |
22 | setToolBarsMovable(false); | 22 | setToolBarsMovable(false); |
23 | 23 | ||
24 | toolbar = new QPEToolBar(this); | 24 | toolbar = new QToolBar(this); |
25 | menubar = new QMenuBar( toolbar ); | 25 | menubar = new QMenuBar( toolbar ); |
26 | mailmenu = new QPopupMenu( menubar ); | 26 | mailmenu = new QPopupMenu( menubar ); |
27 | menubar->insertItem( tr( "Mail" ), mailmenu ); | 27 | menubar->insertItem( tr( "Mail" ), mailmenu ); |
@@ -125,7 +125,7 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
125 | attachWindow->setToolBarsMovable(false); | 125 | attachWindow->setToolBarsMovable(false); |
126 | attachWindow->hide(); | 126 | attachWindow->hide(); |
127 | 127 | ||
128 | attachToolbar = new QPEToolBar(attachWindow); | 128 | attachToolbar = new QToolBar(attachWindow); |
129 | attachToolbar->setVerticalStretchable(true); | 129 | attachToolbar->setVerticalStretchable(true); |
130 | 130 | ||
131 | addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); | 131 | addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this); |
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h index 2c832d6..c14144b 100644 --- a/noncore/unsupported/mail2/composerbase.h +++ b/noncore/unsupported/mail2/composerbase.h | |||
@@ -7,7 +7,7 @@ class QMultiLineEdit; | |||
7 | class MailStatusBar; | 7 | class MailStatusBar; |
8 | class ListViewPlus; | 8 | class ListViewPlus; |
9 | class QPopupMenu; | 9 | class QPopupMenu; |
10 | class QPEToolBar; | 10 | class QToolBar; |
11 | class QMenuBar; | 11 | class QMenuBar; |
12 | class QPopupMenu; | 12 | class QPopupMenu; |
13 | class QComboBox; | 13 | class QComboBox; |
@@ -42,7 +42,7 @@ protected: | |||
42 | ListViewPlus *attachView; | 42 | ListViewPlus *attachView; |
43 | QMainWindow *attachWindow; | 43 | QMainWindow *attachWindow; |
44 | QPopupMenu *attachPopup; | 44 | QPopupMenu *attachPopup; |
45 | QPEToolBar *toolbar, *attachToolbar; | 45 | QToolBar *toolbar, *attachToolbar; |
46 | QMenuBar *menubar; | 46 | QMenuBar *menubar; |
47 | QPopupMenu *mailmenu; | 47 | QPopupMenu *mailmenu; |
48 | QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority; | 48 | QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority; |
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp index 119acfb..4e804c2 100644 --- a/noncore/unsupported/mail2/mainwindowbase.cpp +++ b/noncore/unsupported/mail2/mainwindowbase.cpp | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <qvbox.h> | 5 | #include <qvbox.h> |
6 | 6 | ||
7 | #include <qpe/qpetoolbar.h> | 7 | #include <qpe/qpetoolbar.h> |
8 | #include <qpe/qpemenubar.h> | 8 | #include <qmenubar.h> |
9 | #include <qpe/resource.h> | 9 | #include <qpe/resource.h> |
10 | 10 | ||
11 | #include "mainwindowbase.h" | 11 | #include "mainwindowbase.h" |
@@ -19,7 +19,7 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
19 | setCaption(tr("E-Mail")); | 19 | setCaption(tr("E-Mail")); |
20 | setToolBarsMovable(false); | 20 | setToolBarsMovable(false); |
21 | 21 | ||
22 | toolbar = new QPEToolBar(this); | 22 | toolbar = new QToolBar(this); |
23 | menubar = new QMenuBar( toolbar ); | 23 | menubar = new QMenuBar( toolbar ); |
24 | mailmenu = new QPopupMenu( menubar ); | 24 | mailmenu = new QPopupMenu( menubar ); |
25 | servermenu = new QPopupMenu( menubar ); | 25 | servermenu = new QPopupMenu( menubar ); |
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h index b2e1dc5..c1d6371 100644 --- a/noncore/unsupported/mail2/mainwindowbase.h +++ b/noncore/unsupported/mail2/mainwindowbase.h | |||
@@ -6,7 +6,7 @@ | |||
6 | class ServerConnection; | 6 | class ServerConnection; |
7 | class MailStatusBar; | 7 | class MailStatusBar; |
8 | class FolderWidget; | 8 | class FolderWidget; |
9 | class QPEToolBar; | 9 | class QToolBar; |
10 | class QMenuBar; | 10 | class QMenuBar; |
11 | class QPopupMenu; | 11 | class QPopupMenu; |
12 | class MailTable; | 12 | class MailTable; |
@@ -26,7 +26,7 @@ protected: | |||
26 | ServerConnection *serverConnection; | 26 | ServerConnection *serverConnection; |
27 | MailStatusBar *status; | 27 | MailStatusBar *status; |
28 | FolderWidget *folderView; | 28 | FolderWidget *folderView; |
29 | QPEToolBar *toolbar; | 29 | QToolBar *toolbar; |
30 | QMenuBar *menubar; | 30 | QMenuBar *menubar; |
31 | QPopupMenu *mailmenu, *servermenu; | 31 | QPopupMenu *mailmenu, *servermenu; |
32 | MailTable *mailView; | 32 | MailTable *mailView; |
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp index 10aa14d..f72026f 100644 --- a/noncore/unsupported/mail2/viewmailbase.cpp +++ b/noncore/unsupported/mail2/viewmailbase.cpp | |||
@@ -6,7 +6,7 @@ | |||
6 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
7 | 7 | ||
8 | #include <qpe/qpetoolbar.h> | 8 | #include <qpe/qpetoolbar.h> |
9 | #include <qpe/qpemenubar.h> | 9 | #include <qmenubar.h> |
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | 11 | ||
12 | #include "viewmailbase.h" | 12 | #include "viewmailbase.h" |
@@ -18,7 +18,7 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
18 | setCaption(tr("E-Mail by %1")); | 18 | setCaption(tr("E-Mail by %1")); |
19 | setToolBarsMovable(false); | 19 | setToolBarsMovable(false); |
20 | 20 | ||
21 | toolbar = new QPEToolBar(this); | 21 | toolbar = new QToolBar(this); |
22 | menubar = new QMenuBar( toolbar ); | 22 | menubar = new QMenuBar( toolbar ); |
23 | mailmenu = new QPopupMenu( menubar ); | 23 | mailmenu = new QPopupMenu( menubar ); |
24 | menubar->insertItem( tr( "Mail" ), mailmenu ); | 24 | menubar->insertItem( tr( "Mail" ), mailmenu ); |
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h index 6e55021..898522e 100644 --- a/noncore/unsupported/mail2/viewmailbase.h +++ b/noncore/unsupported/mail2/viewmailbase.h | |||
@@ -6,7 +6,7 @@ | |||
6 | class QAction; | 6 | class QAction; |
7 | class OpenDiag; | 7 | class OpenDiag; |
8 | class QListView; | 8 | class QListView; |
9 | class QPEToolBar; | 9 | class QToolBar; |
10 | class QTextBrowser; | 10 | class QTextBrowser; |
11 | class QMenuBar; | 11 | class QMenuBar; |
12 | class QPopupMenu; | 12 | class QPopupMenu; |
@@ -21,7 +21,7 @@ public: | |||
21 | protected: | 21 | protected: |
22 | QAction *reply, *forward, *attachbutton, *deleteMail; | 22 | QAction *reply, *forward, *attachbutton, *deleteMail; |
23 | QListView *attachments; | 23 | QListView *attachments; |
24 | QPEToolBar *toolbar; | 24 | QToolBar *toolbar; |
25 | QTextBrowser *browser; | 25 | QTextBrowser *browser; |
26 | OpenDiag *openDiag; | 26 | OpenDiag *openDiag; |
27 | QMenuBar *menubar; | 27 | QMenuBar *menubar; |
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 6930d60..a09bc30 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <qpe/qpemessagebox.h> | 17 | #include <qpe/qpemessagebox.h> |
18 | #include <qpe/resource.h> | 18 | #include <qpe/resource.h> |
19 | #include <qpe/config.h> | 19 | #include <qpe/config.h> |
20 | #include <qpe/qpetoolbar.h> | 20 | #include <qtoolbar.h> |
21 | #include <qpe/qcopenvelope_qws.h> | 21 | #include <qpe/qcopenvelope_qws.h> |
22 | #include <qaction.h> | 22 | #include <qaction.h> |
23 | #include <qmessagebox.h> | 23 | #include <qmessagebox.h> |
@@ -82,7 +82,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : | |||
82 | void MainWindow::makeMenu() | 82 | void MainWindow::makeMenu() |
83 | { | 83 | { |
84 | 84 | ||
85 | QPEToolBar *toolBar = new QPEToolBar( this ); | 85 | QToolBar *toolBar = new QToolBar( this ); |
86 | QMenuBar *menuBar = new QMenuBar( toolBar ); | 86 | QMenuBar *menuBar = new QMenuBar( toolBar ); |
87 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); | 87 | QPopupMenu *srvMenu = new QPopupMenu( menuBar ); |
88 | QPopupMenu *viewMenu = new QPopupMenu( menuBar ); | 88 | QPopupMenu *viewMenu = new QPopupMenu( menuBar ); |
@@ -142,7 +142,7 @@ void MainWindow::makeMenu() | |||
142 | QAction *a; | 142 | QAction *a; |
143 | 143 | ||
144 | // SECTIONS | 144 | // SECTIONS |
145 | sectionBar = new QPEToolBar( this ); | 145 | sectionBar = new QToolBar( this ); |
146 | addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); | 146 | addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); |
147 | sectionBar->setHorizontalStretchable( true ); | 147 | sectionBar->setHorizontalStretchable( true ); |
148 | QLabel *label = new QLabel( sectionBar, "section" ); | 148 | QLabel *label = new QLabel( sectionBar, "section" ); |
@@ -169,7 +169,7 @@ void MainWindow::makeMenu() | |||
169 | // sectionBar->setStretchableWidget( section ); | 169 | // sectionBar->setStretchableWidget( section ); |
170 | 170 | ||
171 | //FIND | 171 | //FIND |
172 | findBar = new QPEToolBar(this); | 172 | findBar = new QToolBar(this); |
173 | addToolBar( findBar, "Filter", QMainWindow::Top, TRUE ); | 173 | addToolBar( findBar, "Filter", QMainWindow::Top, TRUE ); |
174 | label = new QLabel( tr("Filter: "), findBar ); | 174 | label = new QLabel( tr("Filter: "), findBar ); |
175 | // label->setBackgroundMode( PaletteForeground ); | 175 | // label->setBackgroundMode( PaletteForeground ); |
@@ -190,7 +190,7 @@ void MainWindow::makeMenu() | |||
190 | findAction->addTo( viewMenu ); | 190 | findAction->addTo( viewMenu ); |
191 | 191 | ||
192 | //SEARCH | 192 | //SEARCH |
193 | searchBar = new QPEToolBar(this); | 193 | searchBar = new QToolBar(this); |
194 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); | 194 | addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); |
195 | label = new QLabel( tr("Search: "), searchBar ); | 195 | label = new QLabel( tr("Search: "), searchBar ); |
196 | // label->setBackgroundMode( PaletteForeground ); | 196 | // label->setBackgroundMode( PaletteForeground ); |
@@ -214,7 +214,7 @@ void MainWindow::makeMenu() | |||
214 | searchAction->addTo( viewMenu ); | 214 | searchAction->addTo( viewMenu ); |
215 | 215 | ||
216 | //DEST | 216 | //DEST |
217 | destBar = new QPEToolBar(this); | 217 | destBar = new QToolBar(this); |
218 | addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); | 218 | addToolBar( destBar, "Destination", QMainWindow::Top, TRUE ); |
219 | label = new QLabel( tr("Destination: "), destBar ); | 219 | label = new QLabel( tr("Destination: "), destBar ); |
220 | // label->setBackgroundMode( PaletteForeground ); | 220 | // label->setBackgroundMode( PaletteForeground ); |
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h index 7446135..ae9fd0c 100644 --- a/noncore/unsupported/oipkg/mainwindow.h +++ b/noncore/unsupported/oipkg/mainwindow.h | |||
@@ -28,7 +28,7 @@ | |||
28 | #include "packagelistview.h" | 28 | #include "packagelistview.h" |
29 | 29 | ||
30 | class QComboBox; | 30 | class QComboBox; |
31 | class QPEToolBar; | 31 | class QToolBar; |
32 | class QLineEdit; | 32 | class QLineEdit; |
33 | class PackageListItem; | 33 | class PackageListItem; |
34 | class QCopChannel; | 34 | class QCopChannel; |
@@ -89,18 +89,18 @@ private: | |||
89 | QAction *runAction; | 89 | QAction *runAction; |
90 | QAction *updateAction; | 90 | QAction *updateAction; |
91 | QAction *findAction; | 91 | QAction *findAction; |
92 | QPEToolBar *findBar; | 92 | QToolBar *findBar; |
93 | QLineEdit *findEdit; | 93 | QLineEdit *findEdit; |
94 | QAction *searchAction; | 94 | QAction *searchAction; |
95 | QAction *searchCommit; | 95 | QAction *searchCommit; |
96 | QPEToolBar *searchBar; | 96 | QToolBar *searchBar; |
97 | QLineEdit *searchEdit; | 97 | QLineEdit *searchEdit; |
98 | QAction *sectionAction; | 98 | QAction *sectionAction; |
99 | QPEToolBar *sectionBar; | 99 | QToolBar *sectionBar; |
100 | QComboBox *section; | 100 | QComboBox *section; |
101 | QComboBox *subsection; | 101 | QComboBox *subsection; |
102 | QAction *destAction; | 102 | QAction *destAction; |
103 | QPEToolBar *destBar; | 103 | QToolBar *destBar; |
104 | QComboBox *destination; | 104 | QComboBox *destination; |
105 | QCheckBox* CheckBoxLink; | 105 | QCheckBox* CheckBoxLink; |
106 | }; | 106 | }; |
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp index de1dcf3..5cdcccf 100644 --- a/noncore/unsupported/qpdf/qpdf.cpp +++ b/noncore/unsupported/qpdf/qpdf.cpp | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <qclipboard.h> | 22 | #include <qclipboard.h> |
23 | #include <qpe/qpetoolbar.h> | 23 | #include <qpe/qpetoolbar.h> |
24 | #include <qtoolbutton.h> | 24 | #include <qtoolbutton.h> |
25 | #include <qpe/qpemenubar.h> | 25 | #include <qmenubar.h> |
26 | #include <qpopupmenu.h> | 26 | #include <qpopupmenu.h> |
27 | #include <qwidgetstack.h> | 27 | #include <qwidgetstack.h> |
28 | #include <qtimer.h> | 28 | #include <qtimer.h> |