s/QPEMenuBar/QMenuBar:

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

12 files changed, 15 insertions, 21 deletions

diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index bf00102..25f9910 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -66,7 +66,7 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
 
 	QPEToolBar *bar = new QPEToolBar( this );
 	bar->setHorizontalStretchable( TRUE );
-	QPEMenuBar *mb = new QPEMenuBar( bar );
+	QMenuBar *mb = new QMenuBar( bar );
 	mb->setMargin( 0 );
 	QPopupMenu *popup = new QPopupMenu( this );
 
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 58538af..4fe45ba 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -12,12 +12,6 @@
 
 #include "mainwindow.h"
 
-#include <opie2/omenubar.h>
-#include <opie2/omessagebox.h>
-#include <opie2/oresource.h>
-#include <opie2/oconfig.h>
-#include <opie2/otoolbar.h>
-#include <opie2/oapplication.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index 5661ad5..3a0d8d1 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -67,7 +67,7 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     ToolBar1->setFixedHeight(22);
     layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 );
 
-    QPEMenuBar *menuBar = new QPEMenuBar( ToolBar1 );
+    QMenuBar *menuBar = new QMenuBar( ToolBar1 );
     QPopupMenu *fileMenu;
     fileMenu = new QPopupMenu( this);
     menuBar->insertItem( tr("File"), fileMenu );
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 087ce00..8c0d138 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -282,7 +282,7 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 //    QToolBar* markBar = new QToolBar("File", this);
 
 #ifdef USEQPE
-    mb = new QPEMenuBar( menubar );
+    mb = new QMenuBar( menubar );
 #else
     mb = new QMenuBar( menubar );
 #endif
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index 2765d47..86c14b1 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -45,7 +45,7 @@ class QPopupMenu;
 class QToolBar;
 #ifdef USEQPE

 class QPEToolBar;
-class QPEMenuBar;

+class QMenuBar;

 #endif
 class CBkmkSelector;
 class QProgressBar;
@@ -383,7 +383,7 @@ private slots:
 //    QPEToolBar /* *menu,*/ *fileBar;
     QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar;
 #ifdef USEQPE

-    QPEMenuBar *mb;

+    QMenuBar *mb;

 #else

     QMenuBar *mb;

 #endif

diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 3915e52..fb2ca79 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -361,7 +361,7 @@ void MainWindow::initActions()
 
 void MainWindow::initMenu()
 {
-  menu=new QPEMenuBar(this);
+  menu=new QMenuBar(this);
 
   menuFile=new QPopupMenu;
   fileNew->addTo(menuFile);
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index 370d82e..4007f88 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -17,7 +17,7 @@
 
 #include <qpe/applnk.h>
 #include <qpe/fileselector.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qmainwindow.h>
 #include <qaction.h>
@@ -40,7 +40,7 @@ class MainWindow: public QMainWindow
 
   // QPE objects
   DocLnk* currentDoc;
-  QPEMenuBar *menu;
+  QMenuBar *menu;
   QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
   FileSelector *fileSelector;
 
diff --git a/noncore/apps/qashmoney/budgetdisplay.cpp b/noncore/apps/qashmoney/budgetdisplay.cpp
index afc6a2d..492595a 100755
--- a/noncore/apps/qashmoney/budgetdisplay.cpp
+++ b/noncore/apps/qashmoney/budgetdisplay.cpp
@@ -33,7 +33,7 @@ BudgetDisplay::BudgetDisplay ( QWidget *parent ) : QWidget ( parent )
     secondline = new QHBox ( this );
     secondline->setSpacing ( 10 );
 
-    menu = new QPEMenuBar ( this );
+    menu = new QMenuBar ( this );
     menu->setFrameStyle ( QFrame::Box | QFrame::Sunken );
     budgetmenu = new QPopupMenu ( this );
     lineitemsmenu = new QPopupMenu ( this );
diff --git a/noncore/apps/qashmoney/budgetdisplay.h b/noncore/apps/qashmoney/budgetdisplay.h
index 3976ce1..a4e806c 100755
--- a/noncore/apps/qashmoney/budgetdisplay.h
+++ b/noncore/apps/qashmoney/budgetdisplay.h
@@ -9,7 +9,7 @@
 #include <qlabel.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qhbox.h>
 
@@ -22,7 +22,7 @@ class BudgetDisplay : public QWidget
     public:
       BudgetDisplay ( QWidget *parent );
 
-      QPEMenuBar *menu;
+      QMenuBar *menu;
       QPopupMenu *budgetmenu;
       QPopupMenu *lineitemsmenu;
       QPopupMenu *datemenu;
diff --git a/noncore/apps/qashmoney/qashmoney.cpp b/noncore/apps/qashmoney/qashmoney.cpp
index 20e8d32..e985f0b 100755
--- a/noncore/apps/qashmoney/qashmoney.cpp
+++ b/noncore/apps/qashmoney/qashmoney.cpp
@@ -23,7 +23,7 @@ QashMoney::QashMoney () : QWidget ()
 
     // Create new menubar for our mainwindow
     // and add menu items
-    mainmenu = new QPEMenuBar ( this );
+    mainmenu = new QMenuBar ( this );
     mainmenu->setFrameStyle ( QFrame::PopupPanel | QFrame::Raised );
     preferencesmenu = new QPopupMenu ( this );
     utilitiesmenu = new QPopupMenu ( this );
diff --git a/noncore/apps/qashmoney/qashmoney.h b/noncore/apps/qashmoney/qashmoney.h
index ec2c7ec..f2c456c 100755
--- a/noncore/apps/qashmoney/qashmoney.h
+++ b/noncore/apps/qashmoney/qashmoney.h
@@ -1,7 +1,7 @@
 #ifndef QASHMONEY_H
 #define QASHMONEY_H
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qlayout.h>
 #include <qtabwidget.h>
@@ -30,7 +30,7 @@ class QashMoney : public QWidget
       QWidget* tab_2;
       QWidget* tab_3;
 
-      QPEMenuBar *mainmenu;
+      QMenuBar *mainmenu;
       QPopupMenu *preferencesmenu;
       QPopupMenu *utilitiesmenu;
 
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index fbb5c24..fdf0072 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -66,7 +66,7 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     ts.kRep = ds->getKeys();
 
 /* build menus */
-    menu = new QPEMenuBar(this, 0);
+    menu = new QMenuBar(this, 0);
 
     QPopupMenu *file_menu = new QPopupMenu;
     file_menu->insertItem("New", this, SLOT(newDocument()));