s/QPEMenuBar/QMenuBar:

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

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
@@ -39,3 +39,3 @@
 #include <qpopupmenu.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qaction.h>
@@ -844,3 +844,3 @@ void FileBrowser::init(const QString & dir)
 
-    QPEMenuBar* menuBar = new QPEMenuBar( toolBar );
+    QMenuBar* menuBar = new QMenuBar( toolBar );
 
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
@@ -24,3 +24,3 @@ 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 );
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
@@ -10,3 +10,3 @@ class QPopupMenu;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
@@ -45,3 +45,3 @@ protected:
 	QPEToolBar *toolbar, *attachToolbar;
- 	QPEMenuBar *menubar;
+ 	QMenuBar *menubar;
 	QPopupMenu *mailmenu;
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
@@ -22,3 +22,3 @@ 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 );
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
@@ -9,3 +9,3 @@ class FolderWidget;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
@@ -29,3 +29,3 @@ protected:
 	QPEToolBar *toolbar;
- 	QPEMenuBar *menubar;
+ 	QMenuBar *menubar;
 	QPopupMenu *mailmenu, *servermenu;
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
@@ -21,3 +21,3 @@ 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 );
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
@@ -10,3 +10,3 @@ class QPEToolBar;
 class QTextBrowser;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
@@ -26,3 +26,3 @@ protected:
 	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
@@ -15,3 +15,3 @@
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
@@ -85,3 +85,3 @@ void MainWindow::makeMenu()
   QPEToolBar *toolBar = new QPEToolBar( this );
-  QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+  QMenuBar *menuBar = new QMenuBar( toolBar );
   QPopupMenu *srvMenu = new QPopupMenu( menuBar );