author | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 14:06:21 (UTC) |
commit | 4518f62746143246d29eb9f08030e241ac33eeb7 (patch) (unidiff) | |
tree | beda04d2c1ddadefd4d0dc2bb18774a15da03bf2 /noncore/unsupported | |
parent | c648101ca50a9782911b58b5158b31e1d0427ab3 (diff) | |
download | opie-4518f62746143246d29eb9f08030e241ac33eeb7.zip opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.gz opie-4518f62746143246d29eb9f08030e241ac33eeb7.tar.bz2 |
s/QPEToolBar/QToolBar:
- remove usage of deprecated classses
- makes it easier to migrate to OToolBar in the future
-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 | |||
@@ -37,3 +37,3 @@ | |||
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> |
@@ -841,3 +841,3 @@ void FileBrowser::init(const QString & dir) | |||
841 | 841 | ||
842 | QPEToolBar* toolBar = new QPEToolBar( this ); | 842 | QToolBar* toolBar = new QToolBar( this ); |
843 | toolBar->setHorizontalStretchable( TRUE ); | 843 | toolBar->setHorizontalStretchable( TRUE ); |
@@ -871,3 +871,3 @@ void FileBrowser::init(const QString & dir) | |||
871 | 871 | ||
872 | toolBar = new QPEToolBar( this ); | 872 | toolBar = new QToolBar( this ); |
873 | 873 | ||
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 | |||
@@ -10,3 +10,3 @@ | |||
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> |
@@ -23,3 +23,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
23 | 23 | ||
24 | toolbar = new QPEToolBar(this); | 24 | toolbar = new QToolBar(this); |
25 | menubar = new QMenuBar( toolbar ); | 25 | menubar = new QMenuBar( toolbar ); |
@@ -127,3 +127,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) | |||
127 | 127 | ||
128 | attachToolbar = new QPEToolBar(attachWindow); | 128 | attachToolbar = new QToolBar(attachWindow); |
129 | attachToolbar->setVerticalStretchable(true); | 129 | attachToolbar->setVerticalStretchable(true); |
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 | |||
@@ -9,3 +9,3 @@ class ListViewPlus; | |||
9 | class QPopupMenu; | 9 | class QPopupMenu; |
10 | class QPEToolBar; | 10 | class QToolBar; |
11 | class QMenuBar; | 11 | class QMenuBar; |
@@ -44,3 +44,3 @@ protected: | |||
44 | QPopupMenu *attachPopup; | 44 | QPopupMenu *attachPopup; |
45 | QPEToolBar *toolbar, *attachToolbar; | 45 | QToolBar *toolbar, *attachToolbar; |
46 | QMenuBar *menubar; | 46 | QMenuBar *menubar; |
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 | |||
@@ -7,3 +7,3 @@ | |||
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> |
@@ -21,3 +21,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) | |||
21 | 21 | ||
22 | toolbar = new QPEToolBar(this); | 22 | toolbar = new QToolBar(this); |
23 | menubar = new QMenuBar( toolbar ); | 23 | menubar = new QMenuBar( toolbar ); |
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 | |||
@@ -8,3 +8,3 @@ class MailStatusBar; | |||
8 | class FolderWidget; | 8 | class FolderWidget; |
9 | class QPEToolBar; | 9 | class QToolBar; |
10 | class QMenuBar; | 10 | class QMenuBar; |
@@ -28,3 +28,3 @@ protected: | |||
28 | FolderWidget *folderView; | 28 | FolderWidget *folderView; |
29 | QPEToolBar *toolbar; | 29 | QToolBar *toolbar; |
30 | QMenuBar *menubar; | 30 | QMenuBar *menubar; |
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 | |||
@@ -8,3 +8,3 @@ | |||
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> |
@@ -20,3 +20,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) | |||
20 | 20 | ||
21 | toolbar = new QPEToolBar(this); | 21 | toolbar = new QToolBar(this); |
22 | menubar = new QMenuBar( toolbar ); | 22 | menubar = new QMenuBar( toolbar ); |
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 | |||
@@ -8,3 +8,3 @@ class OpenDiag; | |||
8 | class QListView; | 8 | class QListView; |
9 | class QPEToolBar; | 9 | class QToolBar; |
10 | class QTextBrowser; | 10 | class QTextBrowser; |
@@ -23,3 +23,3 @@ protected: | |||
23 | QListView *attachments; | 23 | QListView *attachments; |
24 | QPEToolBar *toolbar; | 24 | QToolBar *toolbar; |
25 | QTextBrowser *browser; | 25 | QTextBrowser *browser; |
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 | |||
@@ -19,3 +19,3 @@ | |||
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> |
@@ -84,3 +84,3 @@ void MainWindow::makeMenu() | |||
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 ); |
@@ -144,3 +144,3 @@ void MainWindow::makeMenu() | |||
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 ); |
@@ -171,3 +171,3 @@ void MainWindow::makeMenu() | |||
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 ); |
@@ -192,3 +192,3 @@ void MainWindow::makeMenu() | |||
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 ); |
@@ -216,3 +216,3 @@ void MainWindow::makeMenu() | |||
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 ); |
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 | |||
@@ -30,3 +30,3 @@ | |||
30 | class QComboBox; | 30 | class QComboBox; |
31 | class QPEToolBar; | 31 | class QToolBar; |
32 | class QLineEdit; | 32 | class QLineEdit; |
@@ -91,3 +91,3 @@ private: | |||
91 | QAction *findAction; | 91 | QAction *findAction; |
92 | QPEToolBar *findBar; | 92 | QToolBar *findBar; |
93 | QLineEdit *findEdit; | 93 | QLineEdit *findEdit; |
@@ -95,6 +95,6 @@ private: | |||
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; |
@@ -102,3 +102,3 @@ private: | |||
102 | QAction *destAction; | 102 | QAction *destAction; |
103 | QPEToolBar *destBar; | 103 | QToolBar *destBar; |
104 | QComboBox *destination; | 104 | QComboBox *destination; |
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 | |||
@@ -24,3 +24,3 @@ | |||
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> |