summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/apps/embeddedkonsole/commandeditdialog.cpp2
-rw-r--r--core/apps/embeddedkonsole/konsole.cpp4
-rw-r--r--core/apps/helpbrowser/helpbrowser.cpp4
-rw-r--r--core/apps/textedit/textedit.cpp4
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp4
-rw-r--r--core/pim/addressbook/addressbook.cpp4
-rw-r--r--core/pim/datebook/datebook.cpp4
-rw-r--r--core/pim/datebook2/mainwindow.cpp4
-rw-r--r--core/pim/osearch/mainwindow.cpp4
-rw-r--r--noncore/applets/brightnessapplet/.cvsignore4
-rw-r--r--noncore/apps/checkbook/mainwindow.cpp2
-rw-r--r--noncore/apps/confedit/mainwindow.cpp6
-rw-r--r--noncore/apps/opie-bartender/bartender.cpp2
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.cpp2
-rw-r--r--noncore/apps/opie-reader/QTReaderApp.h4
-rw-r--r--noncore/apps/opie-sheet/mainwindow.cpp2
-rw-r--r--noncore/apps/opie-sheet/mainwindow.h4
-rwxr-xr-xnoncore/apps/qashmoney/budgetdisplay.cpp2
-rwxr-xr-xnoncore/apps/qashmoney/budgetdisplay.h4
-rwxr-xr-xnoncore/apps/qashmoney/qashmoney.cpp2
-rwxr-xr-xnoncore/apps/qashmoney/qashmoney.h4
-rw-r--r--noncore/apps/tableviewer/tableviewer.cpp2
-rw-r--r--noncore/games/backgammon/backgammon.cpp2
-rw-r--r--noncore/games/fifteen/fifteen.cpp2
-rw-r--r--noncore/games/go/gowidget.cpp2
-rw-r--r--noncore/games/minesweep/minesweep.cpp2
-rw-r--r--noncore/games/solitaire/canvascardgame.h2
-rw-r--r--noncore/games/solitaire/canvascardwindow.cpp2
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp2
-rw-r--r--noncore/multimedia/showimg/showimg.cpp2
-rw-r--r--noncore/multimedia/showimg/showimg.h6
-rw-r--r--noncore/net/opieftp/opieftp.cpp2
-rw-r--r--noncore/net/opieftp/opieftp.h2
-rw-r--r--noncore/net/opieirc/mainwindow.cpp2
-rw-r--r--noncore/net/wellenreiter/TODO15
-rw-r--r--noncore/unsupported/filebrowser/filebrowser.cpp4
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp2
-rw-r--r--noncore/unsupported/mail2/composerbase.h4
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp2
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.h4
-rw-r--r--noncore/unsupported/mail2/viewmailbase.cpp2
-rw-r--r--noncore/unsupported/mail2/viewmailbase.h4
-rw-r--r--noncore/unsupported/oipkg/mainwindow.cpp4
43 files changed, 76 insertions, 67 deletions
diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp
index 8b2abfa..97b0a9e 100644
--- a/core/apps/embeddedkonsole/commandeditdialog.cpp
+++ b/core/apps/embeddedkonsole/commandeditdialog.cpp
@@ -8,3 +8,3 @@
#include <qwidget.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/resource.h>
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index ec438c3..d855d90 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -35,3 +35,3 @@
#include <qpainter.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qmessagebox.h>
@@ -287,3 +287,3 @@ void Konsole::init(const char* _pgm, QStrList & _args)
- QPEMenuBar *menuBar = new QPEMenuBar( menuToolBar );
+ QMenuBar *menuBar = new QMenuBar( menuToolBar );
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp
index 531dbff..ed1c165 100644
--- a/core/apps/helpbrowser/helpbrowser.cpp
+++ b/core/apps/helpbrowser/helpbrowser.cpp
@@ -34,3 +34,3 @@
#include <qpopupmenu.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
@@ -86,3 +86,3 @@ void HelpBrowser::init( const QString& _home )
toolbar->setHorizontalStretchable( TRUE );
- QPEMenuBar *menu = new QPEMenuBar( toolbar );
+ QMenuBar *menu = new QMenuBar( toolbar );
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index b875228..0e3254f 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -28,3 +28,3 @@
#include <qpe/qpeapplication.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
@@ -188,3 +188,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
- QPEMenuBar *mb = new QPEMenuBar( bar );
+ QMenuBar *mb = new QMenuBar( bar );
QPopupMenu *file = new QPopupMenu( this );
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 8016d8e..cfcfd41 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -23,3 +23,3 @@
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
@@ -160,3 +160,3 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
// Create Menubar
- QPEMenuBar *menu = new QPEMenuBar( toolbar );
+ QMenuBar *menu = new QMenuBar( toolbar );
menu->setMargin( 0 );
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 438c270..406ced6 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -39,3 +39,3 @@
#include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
// #include <qtoolbar.h>
@@ -95,3 +95,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
- QPEMenuBar *mbList = new QPEMenuBar( bar );
+ QMenuBar *mbList = new QMenuBar( bar );
mbList->setMargin( 0 );
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 07d7164..a040d7c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -38,3 +38,3 @@
#include <qpe/ir.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpemessagebox.h>
@@ -105,3 +105,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
-// QPEMenuBar *mb = new QPEMenuBar( bar );
+// QMenuBar *mb = new QMenuBar( bar );
// mb->setMargin( 0 );
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 68525b3..7d436ae 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -10,3 +10,3 @@
#include <qpe/ir.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpetoolbar.h>
@@ -95,3 +95,3 @@ void MainWindow::initUI() {
- QPEMenuBar* mb = new QPEMenuBar( m_toolBar );
+ QMenuBar* mb = new QMenuBar( m_toolBar );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index f768d81..80738df 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -30,3 +30,3 @@
#include <qwhatsthis.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpe/qpemessagebox.h>
@@ -117,3 +117,3 @@ void MainWindow::makeMenu()
QPEToolBar *searchBar = new QPEToolBar(this);
- QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+ QMenuBar *menuBar = new QMenuBar( toolBar );
QPopupMenu *searchMenu = new QPopupMenu( menuBar );
diff --git a/noncore/applets/brightnessapplet/.cvsignore b/noncore/applets/brightnessapplet/.cvsignore
new file mode 100644
index 0000000..51d12e8
--- a/dev/null
+++ b/noncore/applets/brightnessapplet/.cvsignore
@@ -0,0 +1,4 @@
+Makefile*
+advancedconfigbase.cpp
+advancedconfigbase.h
+moc_*
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);
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index 06523f1..755ed10 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -104,3 +104,3 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
//the menu
- QPEMenuBar* menuBar = new QPEMenuBar(this);
+ QMenuBar* menuBar = new QMenuBar(this);
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index 293cd65..212f7b1 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -54,3 +54,3 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name)
- QPEMenuBar *menubar = new QPEMenuBar( toolbar );
+ QMenuBar *menubar = new QMenuBar( toolbar );
menubar->setMargin(0);
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index 1d38c9f..476f7ce1 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -64,3 +64,3 @@ GoMainWidget::GoMainWidget( QWidget *parent, const char* name) :
- QPEMenuBar *mb = new QPEMenuBar( toolbar );
+ QMenuBar *mb = new QMenuBar( toolbar );
mb->setMargin(0);
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index c84fe53..814070b 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -248,3 +248,3 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
- QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+ QMenuBar *menuBar = new QMenuBar( toolBar );
diff --git a/noncore/games/solitaire/canvascardgame.h b/noncore/games/solitaire/canvascardgame.h
index d159de6..b93cfbf 100644
--- a/noncore/games/solitaire/canvascardgame.h
+++ b/noncore/games/solitaire/canvascardgame.h
@@ -30,3 +30,3 @@
#include <qmainwindow.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
#include <qpainter.h>
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp
index 317a02d..dec5591 100644
--- a/noncore/games/solitaire/canvascardwindow.cpp
+++ b/noncore/games/solitaire/canvascardwindow.cpp
@@ -59,3 +59,3 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f)
#ifdef _PATIENCE_USE_ACCELS_
- QPEMenuBar* menu = menuBar();
+ QMenuBar* menu = menuBar();
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index ac08e15..feae237 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -67,3 +67,3 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
QPEToolBar* menuToolBar = new QPEToolBar(this);
- QPEMenuBar* menuBar = new QPEMenuBar(menuToolBar);
+ QMenuBar* menuBar = new QMenuBar(menuToolBar);
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index 56bdecf..b7754f7 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -233,3 +233,3 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
- menuBar = new QPEMenuBar( toolBar );
+ menuBar = new QMenuBar( toolBar );
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h
index abbd976..da4c0b6 100644
--- a/noncore/multimedia/showimg/showimg.h
+++ b/noncore/multimedia/showimg/showimg.h
@@ -37,3 +37,3 @@ class QAction;
class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
class QPopupMenu;
@@ -252,4 +252,4 @@ private:
QPEToolBar *iconToolBar;
- QPEMenuBar *menuBar;
- QPEMenuBar *current;
+ QMenuBar *menuBar;
+ QMenuBar *current;
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index ee7d32f..48629bf 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -70,3 +70,3 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
- QPEMenuBar *menuBar = new QPEMenuBar(this);
+ QMenuBar *menuBar = new QMenuBar(this);
// QPEToolBar *menuBar = new QPEToolBar(this);
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 7bd615a..f58778a 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -34,3 +34,3 @@ class QWidget;
class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
class QPopupMenu;
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 8f76cdd..95fbdcd 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -18,3 +18,3 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(
setToolBarsMovable(FALSE);
- QPEMenuBar *menuBar = new QPEMenuBar(this);
+ QMenuBar *menuBar = new QMenuBar(this);
QPopupMenu *irc = new QPopupMenu(this);
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index a1d5bee..0336417 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -1,4 +1,15 @@
-- save configuration settings
- beep over headphone / customizable
-- autoshow new nets - maybe in other color or more contrast
+- identification of probe requests
+ i.e. other sniffers around
+
+- decloaking of falsely reported zero-length SSIDs
+
+- option to run skript on
+ - new net
+ - new station
+ - <whatever>
+
+- adaptive hopping scheme !
+
+-
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 );