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
@@ -68,3 +68,3 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
         bar->setHorizontalStretchable( TRUE );
-        QPEMenuBar *mb = new QPEMenuBar( bar );
+        QMenuBar *mb = new QMenuBar( bar );
         mb->setMargin( 0 );
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
@@ -14,8 +14,2 @@
 
-#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>
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
@@ -69,3 +69,3 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
 
-    QPEMenuBar *menuBar = new QPEMenuBar( ToolBar1 );
+    QMenuBar *menuBar = new QMenuBar( ToolBar1 );
     QPopupMenu *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
@@ -284,3 +284,3 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 #ifdef USEQPE
-    mb = new QPEMenuBar( menubar );
+    mb = new QMenuBar( menubar );
 #else
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
@@ -47,3 +47,3 @@ class QToolBar;
 class QPEToolBar;
-class QPEMenuBar;

+class QMenuBar;

 #endif
@@ -385,3 +385,3 @@ private slots:
 #ifdef USEQPE

-    QPEMenuBar *mb;

+    QMenuBar *mb;

 #else

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
@@ -363,3 +363,3 @@ void MainWindow::initMenu()
 {
-  menu=new QPEMenuBar(this);
+  menu=new QMenuBar(this);
 
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
@@ -19,3 +19,3 @@
 #include <qpe/fileselector.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
@@ -42,3 +42,3 @@ class MainWindow: public QMainWindow
   DocLnk* currentDoc;
-  QPEMenuBar *menu;
+  QMenuBar *menu;
   QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
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
@@ -35,3 +35,3 @@ BudgetDisplay::BudgetDisplay ( QWidget *parent ) : QWidget ( parent )
 
-    menu = new QPEMenuBar ( this );
+    menu = new QMenuBar ( this );
     menu->setFrameStyle ( QFrame::Box | QFrame::Sunken );
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
@@ -11,3 +11,3 @@
 #include <qdatetime.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
@@ -24,3 +24,3 @@ class BudgetDisplay : public QWidget
 
-      QPEMenuBar *menu;
+      QMenuBar *menu;
       QPopupMenu *budgetmenu;
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
@@ -25,3 +25,3 @@ QashMoney::QashMoney () : QWidget ()
     // and add menu items
-    mainmenu = new QPEMenuBar ( this );
+    mainmenu = new QMenuBar ( this );
     mainmenu->setFrameStyle ( QFrame::PopupPanel | QFrame::Raised );
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
@@ -3,3 +3,3 @@
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
@@ -32,3 +32,3 @@ class QashMoney : public QWidget
 
-      QPEMenuBar *mainmenu;
+      QMenuBar *mainmenu;
       QPopupMenu *preferencesmenu;
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
@@ -68,3 +68,3 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
 /* build menus */
-    menu = new QPEMenuBar(this, 0);
+    menu = new QMenuBar(this, 0);