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
@@ -32,17 +32,17 @@
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qmessagebox.h>
 #include <qdir.h>
 #include <qregexp.h>
 #include <qheader.h>
 #include <qpe/qpetoolbar.h>
 #include <qpopupmenu.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qaction.h>
 #include <qstringlist.h>
 #include <qcursor.h>
 #include <qmultilineedit.h>
 #include <qfont.h>
 #include <qpainter.h>
 #include <qprogressbar.h>
 
@@ -837,17 +837,17 @@ void FileBrowser::init(const QString & dir)
   fileView->setMenuKeepsOpen(menuKeepsOpen);
   
     setCentralWidget( fileView );
     setToolBarsMovable( FALSE );
 
     QPEToolBar* toolBar = new QPEToolBar( this );
     toolBar->setHorizontalStretchable( TRUE );
 
-    QPEMenuBar* menuBar = new QPEMenuBar( toolBar );
+    QMenuBar* menuBar = new QMenuBar( toolBar );
 
     dirMenu = new QPopupMenu( this );
     menuBar->insertItem( tr( "Dir" ), dirMenu );
 
     sortMenu = new QPopupMenu( this );
     menuBar->insertItem( tr( "Sort" ), sortMenu );
     sortMenu->insertItem( tr( "by Name "), this, SLOT( sortName() ) );
     sortMenu->insertItem( tr( "by Size "), this, SLOT( sortSize() ) );
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
@@ -17,17 +17,17 @@
 
 ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 	setCaption(tr("Compose Message"));
 	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);
 	toolbar->setHorizontalStretchable(true);
 
 	QLabel *spacer = new QLabel(toolbar);
 	spacer->setBackgroundMode(QWidget::PaletteButton);
 	toolbar->setStretchableWidget(spacer);
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
@@ -3,17 +3,17 @@
 
 #include <qmainwindow.h>
 
 class QMultiLineEdit;
 class MailStatusBar;
 class ListViewPlus;
 class QPopupMenu;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 class QComboBox;
 class QLineEdit;
 class QAction;
 class QLabel;
 
 class ComposerBase : public QMainWindow
 {
@@ -38,17 +38,17 @@ protected:
 	static const int POPUP_ATTACH_REMOVE = 2;
 
 	QMultiLineEdit *message;
 	MailStatusBar *status;
 	ListViewPlus *attachView;
 	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;
 	QAction *sendmail, *queuemail, *attachfile, *addressbook, *abort, *addattach, *delattach;
 	QLabel *fromLabel;
 
 protected slots:
 	void slotAttachfileChanged(bool toggled);
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
@@ -15,17 +15,17 @@
 
 MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 	setCaption(tr("E-Mail"));
 	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 );
 	menubar->insertItem( tr( "Servers" ), servermenu );
 
 	addToolBar(toolbar);
 	toolbar->setHorizontalStretchable(true);
 
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
@@ -2,17 +2,17 @@
 #define MAINWINDOWBASE_H
 
 #include <qmainwindow.h>
 
 class ServerConnection;
 class MailStatusBar;
 class FolderWidget;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 class MailTable;
 class QAction;
 
 class MainWindowBase : public QMainWindow
 {
 	Q_OBJECT
 
@@ -22,16 +22,16 @@ public:
 protected slots:
 	void slotFoldersToggled(bool toggled);
 
 protected:
 	ServerConnection *serverConnection;
 	MailStatusBar *status;
 	FolderWidget *folderView;
 	QPEToolBar *toolbar;
- 	QPEMenuBar *menubar;
+ 	QMenuBar *menubar;
 	QPopupMenu *mailmenu, *servermenu;
 	MailTable *mailView;
 	QAction *compose, *sendQueue, *folders, *findmails, *configure;
 
 };
 
 #endif
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
@@ -14,17 +14,17 @@
 
 ViewMailBase::ViewMailBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 	setCaption(tr("E-Mail by %1"));
 	setToolBarsMovable(false);
 
 	toolbar = new QPEToolBar(this);
-  menubar = new QPEMenuBar( toolbar );
+  menubar = new QMenuBar( toolbar );
   mailmenu = new QPopupMenu( menubar );
   menubar->insertItem( tr( "Mail" ), mailmenu );
 
 	toolbar->setHorizontalStretchable(true);
 	addToolBar(toolbar);
 
 	QLabel *spacer = new QLabel(toolbar);
 	spacer->setBackgroundMode(QWidget::PaletteButton);
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
@@ -3,33 +3,33 @@
 
 #include <qmainwindow.h>
 
 class QAction;
 class OpenDiag;
 class QListView;
 class QPEToolBar;
 class QTextBrowser;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 
 class ViewMailBase : public QMainWindow
 {
 	Q_OBJECT
 
 public:
 	ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 
 protected:
 	QAction *reply, *forward, *attachbutton, *deleteMail;
 	QListView *attachments;
 	QPEToolBar *toolbar;
 	QTextBrowser *browser;
 	OpenDiag *openDiag;
- 	QPEMenuBar *menubar;
+ 	QMenuBar *menubar;
   QPopupMenu *mailmenu;
 
 protected slots:
 	void slotChangeAttachview(bool state);
 
 };
 
 #endif
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
@@ -8,17 +8,17 @@
  ***************************************************************************/
 // Copyright (C) 2000 Trolltech AS.
 // adadpted form qpe/qipkg
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 
 #include "mainwindow.h"
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
@@ -78,17 +78,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 	pvDebug(9,"displayList");
   displayList();
 }
 
 void MainWindow::makeMenu()
 {
 
   QPEToolBar *toolBar = new QPEToolBar( this );
-  QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+  QMenuBar *menuBar = new QMenuBar( toolBar );
   QPopupMenu *srvMenu = new QPopupMenu( menuBar );
   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
   QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
   QPopupMenu *helpMenu = new QPopupMenu( menuBar );
 
   setToolBarsMovable( false );
   toolBar->setHorizontalStretchable( true );
   menuBar->insertItem( tr( "Package" ), srvMenu );