s/QPEMenuBar/QMenuBar:

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

6 files changed, 9 insertions, 9 deletions

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
@@ -22,7 +22,7 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         setToolBarsMovable(false);
 
         toolbar = new QPEToolBar(this);
-        menubar = new QPEMenuBar( toolbar );
+        menubar = new QMenuBar( toolbar );
         mailmenu = new QPopupMenu( menubar );
         menubar->insertItem( tr( "Mail" ), mailmenu );
         addToolBar(toolbar);
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
@@ -8,7 +8,7 @@ class MailStatusBar;
 class ListViewPlus;
 class QPopupMenu;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 class QComboBox;
 class QLineEdit;
@@ -43,7 +43,7 @@ protected:
         QMainWindow *attachWindow;
         QPopupMenu *attachPopup;
         QPEToolBar *toolbar, *attachToolbar;
-         QPEMenuBar *menubar;
+         QMenuBar *menubar;
         QPopupMenu *mailmenu;
         QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority;
         QLineEdit *replyto, *to, *cc, *bcc, *subject;
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
@@ -20,7 +20,7 @@ MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
         setToolBarsMovable(false);
 
         toolbar = new QPEToolBar(this);
-        menubar = new QPEMenuBar( toolbar );
+        menubar = new QMenuBar( toolbar );
         mailmenu = new QPopupMenu( menubar );
         servermenu = new QPopupMenu( menubar );
         menubar->insertItem( tr( "Mail" ), mailmenu );
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
@@ -7,7 +7,7 @@ class ServerConnection;
 class MailStatusBar;
 class FolderWidget;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 class MailTable;
 class QAction;
@@ -27,7 +27,7 @@ protected:
         MailStatusBar *status;
         FolderWidget *folderView;
         QPEToolBar *toolbar;
-         QPEMenuBar *menubar;
+         QMenuBar *menubar;
         QPopupMenu *mailmenu, *servermenu;
         MailTable *mailView;
         QAction *compose, *sendQueue, *folders, *findmails, *configure;
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
@@ -19,7 +19,7 @@ ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
         setToolBarsMovable(false);
 
         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
@@ -8,7 +8,7 @@ class OpenDiag;
 class QListView;
 class QPEToolBar;
 class QTextBrowser;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 
 class ViewMailBase : public QMainWindow
@@ -24,7 +24,7 @@ protected:
         QPEToolBar *toolbar;
         QTextBrowser *browser;
         OpenDiag *openDiag;
-         QPEMenuBar *menubar;
+         QMenuBar *menubar;
   QPopupMenu *mailmenu;
 
 protected slots: