-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 @@ #include <qheader.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpopupmenu.h> @@ -841,3 +841,3 @@ void FileBrowser::init(const QString & dir) - QPEToolBar* toolBar = new QPEToolBar( this ); + QToolBar* toolBar = new QToolBar( this ); toolBar->setHorizontalStretchable( TRUE ); @@ -871,3 +871,3 @@ void FileBrowser::init(const QString & dir) - toolBar = new QPEToolBar( this ); + toolBar = new QToolBar( this ); 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 @@ #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> @@ -23,3 +23,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); menubar = new QMenuBar( toolbar ); @@ -127,3 +127,3 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) - attachToolbar = new QPEToolBar(attachWindow); + attachToolbar = new QToolBar(attachWindow); 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; class QPopupMenu; -class QPEToolBar; +class QToolBar; class QMenuBar; @@ -44,3 +44,3 @@ protected: QPopupMenu *attachPopup; - QPEToolBar *toolbar, *attachToolbar; + QToolBar *toolbar, *attachToolbar; 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 @@ #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> @@ -21,3 +21,3 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); 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; class FolderWidget; -class QPEToolBar; +class QToolBar; class QMenuBar; @@ -28,3 +28,3 @@ protected: FolderWidget *folderView; - QPEToolBar *toolbar; + QToolBar *toolbar; 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 @@ #include <qpe/qpetoolbar.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/resource.h> @@ -20,3 +20,3 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) - toolbar = new QPEToolBar(this); + toolbar = new QToolBar(this); 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; class QListView; -class QPEToolBar; +class QToolBar; class QTextBrowser; @@ -23,3 +23,3 @@ protected: QListView *attachments; - QPEToolBar *toolbar; + QToolBar *toolbar; 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 @@ #include <qpe/config.h> -#include <qpe/qpetoolbar.h> +#include <qtoolbar.h> #include <qpe/qcopenvelope_qws.h> @@ -84,3 +84,3 @@ void MainWindow::makeMenu() - QPEToolBar *toolBar = new QPEToolBar( this ); + QToolBar *toolBar = new QToolBar( this ); QMenuBar *menuBar = new QMenuBar( toolBar ); @@ -144,3 +144,3 @@ void MainWindow::makeMenu() // SECTIONS - sectionBar = new QPEToolBar( this ); + sectionBar = new QToolBar( this ); addToolBar( sectionBar, "Section", QMainWindow::Top, TRUE ); @@ -171,3 +171,3 @@ void MainWindow::makeMenu() //FIND - findBar = new QPEToolBar(this); + findBar = new QToolBar(this); addToolBar( findBar, "Filter", QMainWindow::Top, TRUE ); @@ -192,3 +192,3 @@ void MainWindow::makeMenu() //SEARCH - searchBar = new QPEToolBar(this); + searchBar = new QToolBar(this); addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); @@ -216,3 +216,3 @@ void MainWindow::makeMenu() //DEST - destBar = new QPEToolBar(this); + destBar = new QToolBar(this); 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 @@ class QComboBox; -class QPEToolBar; +class QToolBar; class QLineEdit; @@ -91,3 +91,3 @@ private: QAction *findAction; - QPEToolBar *findBar; + QToolBar *findBar; QLineEdit *findEdit; @@ -95,6 +95,6 @@ private: QAction *searchCommit; - QPEToolBar *searchBar; + QToolBar *searchBar; QLineEdit *searchEdit; QAction *sectionAction; - QPEToolBar *sectionBar; + QToolBar *sectionBar; QComboBox *section; @@ -102,3 +102,3 @@ private: QAction *destAction; - QPEToolBar *destBar; + QToolBar *destBar; 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 @@ #include <qtoolbutton.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpopupmenu.h> |