author | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-12-07 13:51:01 (UTC) |
commit | c648101ca50a9782911b58b5158b31e1d0427ab3 (patch) (side-by-side diff) | |
tree | 0fcf5801e23d95e071c7f1b62230c5b15c6256ea /noncore/unsupported | |
parent | 2d793ca674944241480f6939814e3f61d0a0e0fb (diff) | |
download | opie-c648101ca50a9782911b58b5158b31e1d0427ab3.zip opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.gz opie-c648101ca50a9782911b58b5158b31e1d0427ab3.tar.bz2 |
s/QPEMenuBar/QMenuBar:
- remove usage of deprecated classses
- makes it easier to migrate to OMenuBar in the future
-rw-r--r-- | noncore/unsupported/filebrowser/filebrowser.cpp | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/composerbase.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/mainwindowbase.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/mail2/viewmailbase.cpp | 2 | ||||
-rw-r--r-- | noncore/unsupported/mail2/viewmailbase.h | 4 | ||||
-rw-r--r-- | noncore/unsupported/oipkg/mainwindow.cpp | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp index d16e771..114ebfa 100644 --- a/noncore/unsupported/filebrowser/filebrowser.cpp +++ b/noncore/unsupported/filebrowser/filebrowser.cpp @@ -38,5 +38,5 @@ #include <qpe/qpetoolbar.h> #include <qpopupmenu.h> -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qaction.h> #include <qstringlist.h> @@ -843,5 +843,5 @@ void FileBrowser::init(const QString & dir) toolBar->setHorizontalStretchable( TRUE ); - QPEMenuBar* menuBar = new QPEMenuBar( toolBar ); + QMenuBar* menuBar = new QMenuBar( toolBar ); dirMenu = new QPopupMenu( this ); diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp index 6f6ab8e..34d6eb6 100644 --- a/noncore/unsupported/mail2/composerbase.cpp +++ b/noncore/unsupported/mail2/composerbase.cpp @@ -23,5 +23,5 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl) toolbar = new QPEToolBar(this); - menubar = new QPEMenuBar( toolbar ); + menubar = new QMenuBar( toolbar ); mailmenu = new QPopupMenu( menubar ); menubar->insertItem( tr( "Mail" ), mailmenu ); diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h index 58f1157..2c832d6 100644 --- a/noncore/unsupported/mail2/composerbase.h +++ b/noncore/unsupported/mail2/composerbase.h @@ -9,5 +9,5 @@ class ListViewPlus; class QPopupMenu; class QPEToolBar; -class QPEMenuBar; +class QMenuBar; class QPopupMenu; class QComboBox; @@ -44,5 +44,5 @@ protected: QPopupMenu *attachPopup; QPEToolBar *toolbar, *attachToolbar; - QPEMenuBar *menubar; + QMenuBar *menubar; QPopupMenu *mailmenu; QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority; diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp index e35d489..119acfb 100644 --- a/noncore/unsupported/mail2/mainwindowbase.cpp +++ b/noncore/unsupported/mail2/mainwindowbase.cpp @@ -21,5 +21,5 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl) toolbar = new QPEToolBar(this); - menubar = new QPEMenuBar( toolbar ); + menubar = new QMenuBar( toolbar ); mailmenu = new QPopupMenu( menubar ); servermenu = new QPopupMenu( menubar ); diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h index 11c5ea0..b2e1dc5 100644 --- a/noncore/unsupported/mail2/mainwindowbase.h +++ b/noncore/unsupported/mail2/mainwindowbase.h @@ -8,5 +8,5 @@ class MailStatusBar; class FolderWidget; class QPEToolBar; -class QPEMenuBar; +class QMenuBar; class QPopupMenu; class MailTable; @@ -28,5 +28,5 @@ protected: FolderWidget *folderView; QPEToolBar *toolbar; - QPEMenuBar *menubar; + QMenuBar *menubar; QPopupMenu *mailmenu, *servermenu; MailTable *mailView; diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp index a02f73a..10aa14d 100644 --- a/noncore/unsupported/mail2/viewmailbase.cpp +++ b/noncore/unsupported/mail2/viewmailbase.cpp @@ -20,5 +20,5 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl) toolbar = new QPEToolBar(this); - menubar = new QPEMenuBar( toolbar ); + menubar = new QMenuBar( toolbar ); mailmenu = new QPopupMenu( menubar ); menubar->insertItem( tr( "Mail" ), mailmenu ); diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h index ba82017..6e55021 100644 --- a/noncore/unsupported/mail2/viewmailbase.h +++ b/noncore/unsupported/mail2/viewmailbase.h @@ -9,5 +9,5 @@ class QListView; class QPEToolBar; class QTextBrowser; -class QPEMenuBar; +class QMenuBar; class QPopupMenu; @@ -25,5 +25,5 @@ protected: QTextBrowser *browser; OpenDiag *openDiag; - QPEMenuBar *menubar; + QMenuBar *menubar; QPopupMenu *mailmenu; diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp index 04362d3..6930d60 100644 --- a/noncore/unsupported/oipkg/mainwindow.cpp +++ b/noncore/unsupported/oipkg/mainwindow.cpp @@ -14,5 +14,5 @@ #include "mainwindow.h" -#include <qpe/qpemenubar.h> +#include <qmenubar.h> #include <qpe/qpemessagebox.h> #include <qpe/resource.h> @@ -84,5 +84,5 @@ void MainWindow::makeMenu() QPEToolBar *toolBar = new QPEToolBar( this ); - QPEMenuBar *menuBar = new QPEMenuBar( toolBar ); + QMenuBar *menuBar = new QMenuBar( toolBar ); QPopupMenu *srvMenu = new QPopupMenu( menuBar ); QPopupMenu *viewMenu = new QPopupMenu( menuBar ); |