s/QPEMenuBar/QMenuBar:

 - remove usage of deprecated classses
 - makes it easier to migrate to OMenuBar in the future

9 files changed, 17 insertions, 17 deletions

diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp
index 8b2abfa..97b0a9e 100644
--- a/core/apps/embeddedkonsole/commandeditdialog.cpp
+++ b/core/apps/embeddedkonsole/commandeditdialog.cpp
@@ -6,7 +6,7 @@
 #include <qpe/config.h>
 #include <qpe/qpetoolbar.h>
 #include <qwidget.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 #include <qlist.h>
 #include <qtoolbutton.h>
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index ec438c3..d855d90 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -33,7 +33,7 @@
 #include <qfontdialog.h>
 #include <qglobal.h>
 #include <qpainter.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qaction.h>
 #include <qapplication.h>
@@ -285,7 +285,7 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   QPEToolBar *menuToolBar = new QPEToolBar( this );
   menuToolBar->setHorizontalStretchable( TRUE );
 
-  QPEMenuBar *menuBar = new QPEMenuBar( menuToolBar );
+  QMenuBar *menuBar = new QMenuBar( menuToolBar );
 
   fontList = new QPopupMenu( this );
   for(uint i = 0; i < fonts.count(); i++) {
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp
index 531dbff..ed1c165 100644
--- a/core/apps/helpbrowser/helpbrowser.cpp
+++ b/core/apps/helpbrowser/helpbrowser.cpp
@@ -32,7 +32,7 @@
 #include <qdragobject.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qtoolbutton.h>
@@ -84,7 +84,7 @@ void HelpBrowser::init( const QString& _home )
 
     QPEToolBar* toolbar = new QPEToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
-    QPEMenuBar *menu = new QPEMenuBar( toolbar );
+    QMenuBar *menu = new QMenuBar( toolbar );
 
     toolbar = new QPEToolBar( this );
     // addToolBar( toolbar, "Toolbar");
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index b875228..0e3254f 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -26,7 +26,7 @@
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 
@@ -186,7 +186,7 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     bar->setHorizontalStretchable( true );
     menu = bar;
 
-    QPEMenuBar *mb = new QPEMenuBar( bar );
+    QMenuBar *mb = new QMenuBar( bar );
     QPopupMenu *file = new QPopupMenu( this );
     QPopupMenu *edit = new QPopupMenu( this );
     QPopupMenu *advancedMenu = new QPopupMenu(this);
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 8016d8e..cfcfd41 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -21,7 +21,7 @@
 #define QTOPIA_INTERNAL_FSLP
 #include <qpe/qcopenvelope_qws.h>
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
@@ -158,7 +158,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     toolbar->setHorizontalStretchable( TRUE );
 
       // Create Menubar
-    QPEMenuBar *menu = new QPEMenuBar( toolbar );
+    QMenuBar *menu = new QMenuBar( toolbar );
     menu->setMargin( 0 );
 
     QPEToolBar *bar = new QPEToolBar( this );
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 438c270..406ced6 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -37,7 +37,7 @@
 #include <qpe/qpemessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 // #include <qtoolbar.h>
 // #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
@@ -93,7 +93,7 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         QPEToolBar *bar = new QPEToolBar( this );
         bar->setHorizontalStretchable( TRUE );
 
-        QPEMenuBar *mbList = new QPEMenuBar( bar  );
+        QMenuBar *mbList = new QMenuBar( bar  );
         mbList->setMargin( 0 );
 
         QPopupMenu *edit = new QPopupMenu( mbList );
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 07d7164..a040d7c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -36,7 +36,7 @@
 #include <qpe/event.h>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
@@ -103,7 +103,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 //    QPEToolBar *bar = new QPEToolBar( this );
 //    bar->setHorizontalStretchable( TRUE );
 
-//    QPEMenuBar *mb = new QPEMenuBar( bar );
+//    QMenuBar *mb = new QMenuBar( bar );
 //    mb->setMargin( 0 );
 
 //    QPopupMenu *view = new QPopupMenu( this );
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 68525b3..7d436ae 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -8,7 +8,7 @@
 
 #include <qpe/qpeapplication.h>
 #include <qpe/ir.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
@@ -93,7 +93,7 @@ void MainWindow::initUI() {
     m_toolBar = new QPEToolBar( this );
     m_toolBar->setHorizontalStretchable( TRUE );
 
-    QPEMenuBar* mb = new QPEMenuBar( m_toolBar );
+    QMenuBar* mb = new QMenuBar( m_toolBar );
 
     m_popView    = new QPopupMenu( this );
     m_popSetting = new QPopupMenu( this );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index f768d81..80738df 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -28,7 +28,7 @@
 #include <qtextbrowser.h>
 #include <qregexp.h>
 #include <qwhatsthis.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
@@ -115,7 +115,7 @@ void MainWindow::makeMenu()
 {
    QPEToolBar *toolBar = new QPEToolBar( this );
    QPEToolBar *searchBar = new QPEToolBar(this);
-   QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+   QMenuBar *menuBar = new QMenuBar( toolBar );
    QPopupMenu *searchMenu = new QPopupMenu( menuBar );
 //   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
    QPopupMenu *cfgMenu = new QPopupMenu( menuBar );