s/QPEToolBar/QToolBar:

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

41 files changed, 85 insertions, 85 deletions

diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index 25f9910..9fc2125 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -31,17 +31,17 @@
 #include "configuration.h"
 #include "password.h"
 #include "checkbook.h"
 #include "listedit.h"
 
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/qpeapplication.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
 #include <qaction.h>
 #include <qcheckbox.h>
 #include <qdir.h>
 #include <qlineedit.h>
@@ -59,23 +59,23 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
 	// Load configuration options
 	Config config( "checkbook" );
     _cfg.readConfig( config );
 
 
 	// Build menu and tool bars
 	setToolBarsMovable( FALSE );
 
-	QPEToolBar *bar = new QPEToolBar( this );
+	QToolBar *bar = new QToolBar( this );
 	bar->setHorizontalStretchable( TRUE );
 	QMenuBar *mb = new QMenuBar( bar );
 	mb->setMargin( 0 );
 	QPopupMenu *popup = new QPopupMenu( this );
 
-	bar = new QPEToolBar( this );
+	bar = new QToolBar( this );
 	QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
 	a->setWhatsThis( tr( "Click here to create a new checkbook.\n\nYou also can select New from the Checkbook menu." ) );
 	connect( a, SIGNAL( activated() ), this, SLOT( slotNew() ) );
 	a->addTo( popup );
 	a->addTo( bar );
 
 	actionOpen = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
 							  0, this, 0 );
diff --git a/noncore/apps/confedit/mainwindow.h b/noncore/apps/confedit/mainwindow.h
index 96331db..23aca52 100644
--- a/noncore/apps/confedit/mainwindow.h
+++ b/noncore/apps/confedit/mainwindow.h
@@ -14,17 +14,17 @@
 
 #include <qmainwindow.h>
 #include <qdialog.h>
 #include <qaction.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 #include "editwidget.h"
 
-class QPEToolBar;
+class QToolBar;
 class ListViewItemConfFile;
 class ListViewConfDir;
 class ListViewItemConf;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index 3a0d8d1..8c4ee93 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -13,17 +13,17 @@
 #include "bartender.h"
 #include "newdrinks.h"
 #include "showdrinks.h"
 #include "inputDialog.h"
 #include "searchresults.h"
 #include "bac.h"
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <opie/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include <qcstring.h>
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qpushbutton.h>
@@ -58,17 +58,17 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
   setName( "Bartender" );
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     setCaption( tr( "Bartender" ) );
 
-    ToolBar1 = new QPEToolBar( this, "ToolBar1" );
+    ToolBar1 = new QToolBar( this, "ToolBar1" );
     ToolBar1->setFixedHeight(22);
     layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 );
 
     QMenuBar *menuBar = new QMenuBar( ToolBar1 );
     QPopupMenu *fileMenu;
     fileMenu = new QPopupMenu( this);
     menuBar->insertItem( tr("File"), fileMenu );
 
diff --git a/noncore/apps/opie-bartender/bartender.h b/noncore/apps/opie-bartender/bartender.h
index 69cfa82..df1af76 100644
--- a/noncore/apps/opie-bartender/bartender.h
+++ b/noncore/apps/opie-bartender/bartender.h
@@ -17,27 +17,27 @@
 #include <qmainwindow.h>
 #include <qfile.h>
 
 class QVBoxLayout; 
 class QHBoxLayout; 
 class QGridLayout; 
 class QListView;
 class QListViewItem;
-class QPEToolBar;
+class QToolBar;
 
 class Bartender : public QMainWindow
 { 
     Q_OBJECT
 
 public:
     Bartender( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     ~Bartender();
 
-    QPEToolBar* ToolBar1;
+    QToolBar* ToolBar1;
     QListView* DrinkView;
     QFile dbFile;
 public slots:
     void doEdit();
     
 protected:
 
 protected slots:
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 8c0d138..f10020a 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -17,17 +17,17 @@
 ** not clear to you.
 **
 **********************************************************************/
 #include "useqpe.h"
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qwidgetstack.h>
 #ifdef USEQPE
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #endif
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #ifdef USEQPE
 #include <qpe/menubutton.h>
 #include <qpe/fontdatabase.h>
 #endif
@@ -249,18 +249,18 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
   m_autogenstr = "^ *[A-Z].*[a-z] *$";
 
 #ifdef USEQPE
     setIcon( Resource::loadPixmap( PICDIR  "uqtreader") );
 #else
     setIcon( QPixmap (PICDIR  "uqtreader.png") );
 #endif /* USEQPE */
 
-//    QPEToolBar *bar = new QPEToolBar( this );
-//    menubar = new QPEToolBar( this );
+//    QToolBar *bar = new QToolBar( this );
+//    menubar = new QToolBar( this );
 #ifdef USEQPE
   Config config( APPDIR );
 #else
     QDir d = QDir::home();                      // "/"
     if ( !d.cd(APPDIR) ) {                       // "/tmp"
         qWarning( "Cannot find the \"~/" APPDIR "\" directory" );
 		d = QDir::home();
 		d.mkdir(APPDIR);
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index 86c14b1..ab6f60e 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -39,17 +39,17 @@
 #include <qlistbox.h>
 //#include "Queue.h"
 
 class QWidgetStack;
 class QToolButton;
 class QPopupMenu;
 class QToolBar;
 #ifdef USEQPE

-class QPEToolBar;
+class QToolBar;
 class QMenuBar;

 #endif
 class CBkmkSelector;
 class QProgressBar;
 class QAction;
 class CAnnoEdit;
 class QFloatBar;
 class CDrawBuffer;
@@ -375,17 +375,17 @@ private slots:
     QStack<searchrecord>* searchStack;
     bool dosearch(size_t start, CDrawBuffer& test, const QString& arg);
 #else
     bool dosearch(size_t start, CDrawBuffer& test, const QRegExp& arg);
 #endif
     QWidgetStack *editorStack;
     QTReader* reader;
     QComboBox* m_fontSelector;
-//    QPEToolBar /* *menu,*/ *fileBar;
+//    QToolBar /* *menu,*/ *fileBar;
     QToolBar *menubar, *fileBar, *navBar, *viewBar, *markBar;
 #ifdef USEQPE

     QMenuBar *mb;

 #else

     QMenuBar *mb;

 #endif

     QFloatBar *searchBar, *regBar/*, *m_fontBar*/;
     QToolBar /* *searchBar, *regBar,*/ *m_fontBar;
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index fb2ca79..78b3073 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -458,32 +458,32 @@ void MainWindow::initMenu()
   insertCells->addTo(menuInsert);
   insertRows->addTo(menuInsert);
   insertCols->addTo(menuInsert);
   insertSheets->addTo(menuInsert);
 }
 
 void MainWindow::initStandardToolbar()
 {
-  toolbarStandard=new QPEToolBar(this);
+  toolbarStandard=new QToolBar(this);
   toolbarStandard->setHorizontalStretchable(TRUE);
   moveToolBar(toolbarStandard, Top);
 
   fileNew->addTo(toolbarStandard);
   fileOpen->addTo(toolbarStandard);
   fileSave->addTo(toolbarStandard);
 
   comboSheets=new QComboBox(toolbarStandard);
   toolbarStandard->setStretchableWidget(comboSheets);
   connect(comboSheets, SIGNAL(activated(const QString &)), this, SLOT(slotSheetChanged(const QString &)));
 }
 
 void MainWindow::initFunctionsToolbar()
 {
-  toolbarFunctions=new QPEToolBar(this);
+  toolbarFunctions=new QToolBar(this);
   toolbarFunctions->setHorizontalStretchable(TRUE);
   moveToolBar(toolbarFunctions, Bottom);
 
   funcEqual->addTo(toolbarFunctions);
   funcPlus->addTo(toolbarFunctions);
   funcMinus->addTo(toolbarFunctions);
   funcCross->addTo(toolbarFunctions);
   funcDivide->addTo(toolbarFunctions);
@@ -495,17 +495,17 @@ void MainWindow::initFunctionsToolbar()
   toolFunction->setPixmap(func_func_xpm);
   toolFunction->setTextLabel(tr("Functions"));
   toolFunction->setPopup(submenuFunc);
   toolFunction->setPopupDelay(0);
 }
 
 void MainWindow::initEditToolbar()
 {
-  toolbarEdit=new QPEToolBar(this);
+  toolbarEdit=new QToolBar(this);
   toolbarEdit->setHorizontalStretchable(TRUE);
   moveToolBar(toolbarEdit, Bottom);
 
   editAccept->addTo(toolbarEdit);
   editCancel->addTo(toolbarEdit);
 
   editData=new QLineEdit(toolbarEdit);
   toolbarEdit->setStretchableWidget(editData);
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index 4007f88..bd99c36 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -13,17 +13,17 @@
  */
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qpe/applnk.h>
 #include <qpe/fileselector.h>
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmainwindow.h>
 #include <qaction.h>
 #include <qlineedit.h>
 #include <qbutton.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 
 #include "sheet.h"
@@ -36,17 +36,17 @@ typedef struct typeSheet
 
 class MainWindow: public QMainWindow
 {
   Q_OBJECT
 
   // QPE objects
   DocLnk* currentDoc;
   QMenuBar *menu;
-  QPEToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
+  QToolBar *toolbarFunctions, *toolbarEdit, *toolbarStandard;
   FileSelector *fileSelector;
 
   // QT objects
   QPopupMenu *menuFile, *menuEdit, *menuInsert, *menuFormat, *menuData, *menuHelp,
              *submenuFunc, *submenuFuncStd, *submenuFuncMath, *submenuFuncStat,
              *submenuRow, *submenuCol, *submenuSheet;
   QAction *fileNew, *fileOpen, *fileSave, *fileSaveAs, *fileQuit, *helpAbout, *editAccept, *editCancel, *formatCells,
           *funcPlus, *funcMinus, *funcCross, *funcDivide, *funcParanOpen, *funcParanClose, *funcComma, *funcEqual,
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index fdf0072..207172d 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -28,17 +28,17 @@
 #include "db/datacache.h"
 
 /* QPE includes */
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
 #include <qpe/qpetoolbar.h>
 
 /* QTE includes */
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qbuffer.h>
 /*!
     \class TableViewerWindow
@@ -87,17 +87,17 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     QPopupMenu *view_menu = new QPopupMenu;
     view_menu->insertItem("Browse View", this, SLOT(browseViewSlot()));
     view_menu->insertItem("List View", this, SLOT(listViewSlot()));
     menu->insertItem("View", view_menu); 
 
     QVBoxLayout *main_layout = new QVBoxLayout;
 
     /* Build tool bar */
-    navigation = new QPEToolBar(this, "navigation");
+    navigation = new QToolBar(this, "navigation");
     QToolButton *newItemButton = new QToolButton(
       QIconSet(Resource::loadPixmap("new")), "New Item", QString::null,
       this, SLOT(newItemSlot()), navigation, "New Item");
     QToolButton *editItemButton = new QToolButton(
       QIconSet(Resource::loadPixmap("edit")), "Edit Item", QString::null,
       this, SLOT(editItemSlot()), navigation, "Edit Item");
     QToolButton *deleteItemButton = new QToolButton(
       QIconSet(Resource::loadPixmap("trash")), "Delete Item", 
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index c89dec5..25c8919 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -1,14 +1,14 @@
 #include <qiconset.h>
 #include <qdialog.h>
 #include <qpixmap.h>
 #include <qdom.h>
 #include <qaction.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qstatusbar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qpe/qpetoolbar.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
 #include <qspinbox.h>
 #include <qlistbox.h>
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index 755ed10..e9e5467 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -10,17 +10,17 @@
 #include <qfile.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qstring.h>
 #include <qtimer.h>
 #include <qmainwindow.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include <stdlib.h>
 
 
 BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
         : QMainWindow(parent, name, fl)
 {
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index 212f7b1..2e4ed94 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -25,17 +25,17 @@
 
 #include <qvbox.h>
 #include <qaction.h>
 #include <qlayout.h>
 #include <qpainter.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qstringlist.h>
 #include <qapplication.h>
 
 #include <stdlib.h>
 #include <time.h>
 
 FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name)
   : QMainWindow( parent, name )
@@ -43,17 +43,17 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name)
   // random seed
   srand(time(0));
 
   setToolBarsMovable( FALSE );
   QVBox *vbox = new QVBox( this );
   PiecesTable *table = new PiecesTable( vbox );
   setCentralWidget(vbox);
 
-  QPEToolBar *toolbar = new QPEToolBar(this);
+  QToolBar *toolbar = new QToolBar(this);
   toolbar->setHorizontalStretchable( TRUE );
   addToolBar(toolbar);
 
   QMenuBar *menubar = new QMenuBar( toolbar );
   menubar->setMargin(0);
 
   QPopupMenu *game = new QPopupMenu( this );
 
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index 476f7ce1..6d06f3b 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -21,17 +21,17 @@
 #include "gowidget.h"
 
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qapplication.h> //processEvents()
 #include <qlabel.h>
 
 //#include <stdio.h>
 
 #include "amigo.h"
@@ -53,17 +53,17 @@ static bool smallStones = FALSE;
 
 GoMainWidget::GoMainWidget( QWidget *parent, const char* name) :
 	QMainWindow( parent, name )
 {
      setToolBarsMovable( FALSE );
     GoWidget *go = new GoWidget(this);
 
     setCentralWidget(go);
-    toolbar = new QPEToolBar(this);
+    toolbar = new QToolBar(this);
     toolbar->setHorizontalStretchable( TRUE );
     addToolBar(toolbar);
 
     QMenuBar *mb = new QMenuBar( toolbar );
     mb->setMargin(0);
     QPopupMenu *file = new QPopupMenu( this );
 
     QAction *a = new QAction( tr( "New Game" ), QString::null, 0, this, 0 );
diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp
index 1a1d05d..7802e38 100644
--- a/noncore/games/mindbreaker/mindbreaker.cpp
+++ b/noncore/games/mindbreaker/mindbreaker.cpp
@@ -209,17 +209,17 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags )
 : QMainWindow(parent, name, wFlags),
     canvas(board_height, board_width)
 {
     MindBreakerBoard *m = new MindBreakerBoard(canvas, this);
     setCentralWidget(m);
     
     setToolBarsMovable( FALSE );
 
-    QPEToolBar *tb = new QPEToolBar(this);
+    QToolBar *tb = new QToolBar(this);
     tb->setHorizontalStretchable( TRUE );
 
     QPixmap newicon = Resource::loadPixmap("new");
     new QToolButton(newicon, tr("New Game"), 0, 
                                        m, SLOT(clear()), tb, "NewGame");
 
     score = new QToolButton(tb);
     score->setText("");
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index 814070b..48644b3 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -20,17 +20,17 @@
 
 #include "minesweep.h"
 #include "minefield.h"
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qlcdnumber.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qpalette.h>
 #include <qapplication.h>
 #include <qlayout.h>
@@ -238,17 +238,17 @@ private:
 
 MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f )
 : QMainWindow( parent, name, f )
 {
     srand(::time(0));
     setCaption( tr("Mine Hunt") );
     setIcon( Resource::loadPixmap( "minesweep_icon" ) );
 
-    QPEToolBar *toolBar = new QPEToolBar( this );
+    QToolBar *toolBar = new QToolBar( this );
     toolBar->setHorizontalStretchable( TRUE );
 
     QMenuBar *menuBar = new QMenuBar( toolBar );
 
     QPopupMenu *gameMenu = new QPopupMenu( this );
     gameMenu->insertItem( tr("Beginner"), this, SLOT( beginner() ) );
     gameMenu->insertItem( tr("Advanced"), this, SLOT( advanced() ) );
     gameMenu->insertItem( tr("Expert"), this, SLOT( expert() ) );
diff --git a/noncore/games/parashoot/interface.cpp b/noncore/games/parashoot/interface.cpp
index 84e5e60..db98720 100644
--- a/noncore/games/parashoot/interface.cpp
+++ b/noncore/games/parashoot/interface.cpp
@@ -40,17 +40,17 @@ ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) :
     QPixmap bg = Resource::loadPixmap("parashoot/sky");
     canvas.setBackgroundPixmap(bg);
 
     pb = new QCanvasView(&canvas, this);
     pb->setFocus();
 
     setToolBarsMovable( FALSE );
 
-    QPEToolBar* toolbar = new QPEToolBar(this);
+    QToolBar* toolbar = new QToolBar(this);
     toolbar->setHorizontalStretchable( TRUE );
 
     setCaption( tr("ParaShoot") );
     QPixmap newicon = Resource::loadPixmap("parashoot/manicon");
     setIcon(newicon);
     new QToolButton(newicon, tr("New Game"), 0,
                            this, SLOT(newGame()), toolbar, "New Game");
 
diff --git a/noncore/games/snake/interface.cpp b/noncore/games/snake/interface.cpp
index 68e0f14..f1227cb 100644
--- a/noncore/games/snake/interface.cpp
+++ b/noncore/games/snake/interface.cpp
@@ -40,17 +40,17 @@ SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) :
 
     cv = new QCanvasView(&canvas, this);
 
     pauseTimer = new QTimer(this);
     connect(pauseTimer, SIGNAL(timeout()), this, SLOT(wait()) );
 
     setToolBarsMovable( FALSE );
 
-    QPEToolBar* toolbar = new QPEToolBar( this);
+    QToolBar* toolbar = new QToolBar( this);
     toolbar->setHorizontalStretchable( TRUE );
 
     QPixmap newicon = Resource::loadPixmap("ksnake");
     setIcon(newicon);
     (void)new QToolButton(newicon, tr("New Game"), 0,
                             this, SLOT(newGame()), toolbar, "New Game");
 
     scorelabel = new QLabel(toolbar);
diff --git a/noncore/games/solitaire/canvascardgame.cpp b/noncore/games/solitaire/canvascardgame.cpp
index 8250193..9ae2a23 100644
--- a/noncore/games/solitaire/canvascardgame.cpp
+++ b/noncore/games/solitaire/canvascardgame.cpp
@@ -22,17 +22,17 @@
 #include "canvasshapes.h"
 #include "canvascard.h"
 #include "canvascardgame.h"
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qmainwindow.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpainter.h>
 #include <qgfx_qws.h>
 
 #include <stdlib.h>
 #include <limits.h>
 #include <time.h>
 #include <math.h>
 
diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp
index d46e824..c01551d 100644
--- a/noncore/games/wordgame/wordgame.cpp
+++ b/noncore/games/wordgame/wordgame.cpp
@@ -129,17 +129,17 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) :
 
     setIcon( Resource::loadPixmap( "wordgame/WordGame.png" ) );
     setCaption( tr("Word Game") );
 
     setToolBarsMovable( FALSE );
     vbox = new QVBox(this);
 
     setCentralWidget(vbox);
-    toolbar = new QPEToolBar(this);
+    toolbar = new QToolBar(this);
     addToolBar(toolbar, Bottom);
     reset = new QToolButton(Resource::loadPixmap("back"), tr("Back"), "", this, SLOT(resetTurn()), toolbar);
     done = new QToolButton(Resource::loadPixmap("done"), tr("Done"), "", this, SLOT(endTurn()), toolbar);
     scoreinfo = new ScoreInfo(toolbar);
     scoreinfo->setFont(QFont("Helvetica",10));
     new QToolButton(Resource::loadPixmap("finish"), tr("Close"), "", this, SLOT(endGame()), toolbar);
     toolbar->setStretchableWidget(scoreinfo);
 
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index feae237..86a10a5 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -31,17 +31,17 @@
 #include "thumbnailview.h"
 
 #include <opie/colordialog.h>
 #include <opie/colorpopupmenu.h>
 
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 
 #include <qaction.h>
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qpainter.h>
 #include <qspinbox.h>
@@ -59,17 +59,17 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateView()));
 
     setCentralWidget(m_pDrawPadCanvas);
 
     // init menu
 
     setToolBarsMovable(false);
 
-    QPEToolBar* menuToolBar = new QPEToolBar(this);
+    QToolBar* menuToolBar = new QToolBar(this);
     QMenuBar* menuBar = new QMenuBar(menuToolBar);
 
     QPopupMenu* toolsPopupMenu = new QPopupMenu(menuBar);
 
     QAction* deleteAllAction = new QAction(tr("Delete All"), QString::null, 0, this);
     connect(deleteAllAction, SIGNAL(activated()), this, SLOT(deleteAll()));
     deleteAllAction->addTo(toolsPopupMenu);
 
@@ -98,39 +98,39 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     m_pAntiAliasingAction = new QAction(tr("Anti-Aliasing"), QString::null, 0, this);
     m_pAntiAliasingAction->setToggleAction(true);
     m_pAntiAliasingAction->addTo(toolsPopupMenu);
 
     menuBar->insertItem(tr("Tools"), toolsPopupMenu);
 
     // init page toolbar
 
-    QPEToolBar* pageToolBar = new QPEToolBar(this);
+    QToolBar* pageToolBar = new QToolBar(this);
 
     QAction* newPageAction = new QAction(tr("New Page"), Resource::loadPixmap("new"), QString::null, 0, this);
     connect(newPageAction, SIGNAL(activated()), this, SLOT(newPage()));
     newPageAction->addTo(pageToolBar);
     newPageAction->setWhatsThis( tr( "Click here to add a new sheet." ) );
 
     QAction* clearPageAction = new QAction(tr("Clear Page"), Resource::loadPixmap("drawpad/clear"), QString::null, 0, this);
     connect(clearPageAction, SIGNAL(activated()), this, SLOT(clearPage()));
     clearPageAction->addTo(pageToolBar);
     clearPageAction->setWhatsThis( tr( "Click here to erase the current sheet." ) );
 
     QAction* deletePageAction = new QAction(tr("Delete Page"), Resource::loadPixmap("trash"), QString::null, 0, this);
     connect(deletePageAction, SIGNAL(activated()), this, SLOT(deletePage()));
     deletePageAction->addTo(pageToolBar);
     deletePageAction->setWhatsThis( tr( "Click here to remove the current sheet." ) );
 
-    QPEToolBar* emptyToolBar = new QPEToolBar(this);
+    QToolBar* emptyToolBar = new QToolBar(this);
     emptyToolBar->setHorizontalStretchable(true);
 
     // init navigation toolbar
 
-    QPEToolBar* navigationToolBar = new QPEToolBar(this);
+    QToolBar* navigationToolBar = new QToolBar(this);
 
     m_pUndoAction = new QAction(tr("Undo"), Resource::loadIconSet("undo"), QString::null, 0, this);
     connect(m_pUndoAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(undo()));
     m_pUndoAction->addTo(navigationToolBar);
     m_pUndoAction->setWhatsThis( tr( "Click here to undo the last action." ) );
 
     m_pRedoAction = new QAction(tr("Redo"), Resource::loadIconSet("redo"), QString::null, 0, this);
     connect(m_pRedoAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(redo()));
@@ -154,17 +154,17 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
 
     m_pLastPageAction = new QAction(tr("Last Page"), Resource::loadIconSet("fastforward"), QString::null, 0, this);
     connect(m_pLastPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goLastPage()));
     m_pLastPageAction->addTo(navigationToolBar);
     m_pLastPageAction->setWhatsThis( tr( "Click here to view the last page." ) );
 
     // init draw mode toolbar
 
-    QPEToolBar* drawModeToolBar = new QPEToolBar(this);
+    QToolBar* drawModeToolBar = new QToolBar(this);
 
     m_pLineToolButton = new QToolButton(drawModeToolBar);
     m_pLineToolButton->setToggleButton(true);
     QWhatsThis::add( m_pLineToolButton, tr( "Click here to select one of the available tools to draw lines." ) );
 
 
     QPopupMenu* linePopupMenu = new QPopupMenu(m_pLineToolButton);
 
@@ -231,23 +231,23 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     m_pEraseToolAction->addTo(drawModeToolBar);
     m_pEraseToolAction->setWhatsThis( tr( "Click here to select the eraser tool." ) );
 
     m_pTool = 0;
     setRectangleTool();
     setEllipseTool();
     setPointTool();
 
-    emptyToolBar = new QPEToolBar(this);
+    emptyToolBar = new QToolBar(this);
     emptyToolBar->setHorizontalStretchable(true);
     emptyToolBar->addSeparator();
 
     // init draw parameters toolbar
 
-    QPEToolBar* drawParametersToolBar = new QPEToolBar(this);
+    QToolBar* drawParametersToolBar = new QToolBar(this);
 
     m_pPenWidthSpinBox = new QSpinBox(1, 9, 1, drawParametersToolBar);
     connect(m_pPenWidthSpinBox, SIGNAL(valueChanged(int)), this, SLOT(changePenWidth(int)));
 
     QToolTip::add(m_pPenWidthSpinBox, tr("Pen Width"));
     m_pPenWidthSpinBox->setValue(1);
     m_pPenWidthSpinBox->setFocusPolicy(QWidget::NoFocus);
     QWhatsThis::add( m_pPenWidthSpinBox, tr( "Click here to select the width of the drawing pen." ) );
diff --git a/noncore/multimedia/opierec/helpwindow.cpp b/noncore/multimedia/opierec/helpwindow.cpp
index 1ab6510..a3b29fa 100644
--- a/noncore/multimedia/opierec/helpwindow.cpp
+++ b/noncore/multimedia/opierec/helpwindow.cpp
@@ -31,17 +31,17 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par
     Strlist.append( home_);
     browser->mimeSourceFactory()->setFilePath( Strlist );
     browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
 
     connect( browser, SIGNAL( textChanged() ), this, SLOT( textChanged() ) );
 
     if ( !home_.isEmpty() )
         browser->setSource( home_ );
-    QPEToolBar *toolbar = new QPEToolBar( this );
+    QToolBar *toolbar = new QToolBar( this );
 
     QAction *a = new QAction( tr( "Backward" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), browser, SLOT( backward() ) );
     a->addTo( toolbar );
 
     a = new QAction( tr( "Forward" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), browser, SLOT( forward() ) );
     a->addTo( toolbar );
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index b7754f7..ba76e57 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -31,17 +31,17 @@
 
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qfileinfo.h>
 #include <math.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qwidgetstack.h>
 #include <qpe/qpetoolbar.h>
 #include <qaction.h>
 #include <qfiledialog.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qscrollview.h>
 #include <qlabel.h>
@@ -223,17 +223,17 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
 
     showThumbView=cfg.readBoolEntry("ShowThumbnails",false);
     isSized=cfg.readBoolEntry("SizeToScreen",true);
 
     isFullScreen = FALSE;
 
     setToolBarsMovable( FALSE );
 
-    toolBar = new QPEToolBar( this );
+    toolBar = new QToolBar( this );
     toolBar->setHorizontalStretchable( TRUE );
 
     menuBar = new QMenuBar( toolBar );
 
     current=menuBar;
 
 
 
@@ -309,17 +309,17 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     //fileSelector->setCloseVisible(FALSE);
     connect( fileSelector, SIGNAL( closeMe() ), this, SLOT( closeFileSelector() ) );
     connect( fileSelector, SIGNAL( fileSelected( const DocLnk &) ),
              this, SLOT( openFile( const DocLnk & ) ) );
 
     imageList = fileSelector->fileList();
     slideAction->setEnabled( imageList.count() != 0);
 
-    iconToolBar = new QPEToolBar(this);
+    iconToolBar = new QToolBar(this);
 
     QAction *a;
 
     a = new QAction( tr( "Open ..." ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( open() ) );
     a->addTo( fileMenuView);
     a->addTo( iconToolBar );
 
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h
index da4c0b6..9cf9bfd 100644
--- a/noncore/multimedia/showimg/showimg.h
+++ b/noncore/multimedia/showimg/showimg.h
@@ -29,17 +29,17 @@
 #include <qscrollview.h>
 #include <qdialog.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 #include <qwmatrix.h>
 
 
 class QAction;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
 class QPopupMenu;
 class QWidgetStack;
 class FileSelector;
 class DocLnk;
 class QLabel;
 class QAction;
 class QSpinBox;
@@ -243,18 +243,18 @@ private:
         BLACKANDWHITE
     };
 
     QString filename;
     QString delayLoad;
     QImage image;           // the loaded image
     QPixmap pm;         // the converted pixmap
     QPixmap pmScaled;       // the scaled pixmap
-    QPEToolBar  *toolBar;
-    QPEToolBar  *iconToolBar;
+    QToolBar  *toolBar;
+    QToolBar  *iconToolBar;
     QMenuBar  *menuBar;
     QMenuBar  *current;
 
 
     QPopupMenu  *fileMenuFile;
     QPopupMenu  *viewMenuFile;
     QPopupMenu  *optionsMenuFile;
     QPopupMenu  *fileMenuView;
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index 48629bf..3250627 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -14,17 +14,17 @@
 #include "opieftp.h"
 
 extern "C" {
 #include "../ftplib/ftplib.h"
 }
 
 #include "inputDialog.h"
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 
 #include <qtextstream.h>
 #include <qpushbutton.h>
 #include <qtoolbutton.h>
@@ -64,17 +64,17 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
     fuckeduphack=FALSE;
     QGridLayout *layout = new QGridLayout( this );
     layout->setSpacing( 2);
     layout->setMargin( 2);
 
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     QMenuBar *menuBar = new QMenuBar(this);
-//     QPEToolBar *menuBar = new QPEToolBar(this);
+//     QToolBar *menuBar = new QToolBar(this);
 //     menuBar->setHorizontalStretchable( TRUE );
 
     QWMatrix matrix;
     QPixmap pix(Resource::loadPixmap( "UnknownDocument" ));
     matrix.scale( .4, .4);
     unknownXpm =  pix.xForm(matrix);
 
     connectionMenu  = new QPopupMenu( this );
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index f58778a..076a906 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -26,17 +26,17 @@ class QGridLayout;
 class QComboBox;
 class QListView;
 class QListViewItem;
 class QLabel;
 class QProgressBar;
 class QSpinBox;
 class QTabWidget;
 class QWidget;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
 class QPopupMenu;
 class QFile;
 class QLineEdit;
 class QPushButton;
 class QToolButton;
 class QStringList;
 class QListBox;
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 95fbdcd..be6f8ed 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -1,9 +1,9 @@
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpopupmenu.h>
 #include <qwhatsthis.h>
 
 #include "mainwindow.h"
 #include "ircservertab.h"
 #include "ircserverlist.h"
diff --git a/noncore/net/ubrowser/mainview.cpp b/noncore/net/ubrowser/mainview.cpp
index 0d3f171..f299b54 100644
--- a/noncore/net/ubrowser/mainview.cpp
+++ b/noncore/net/ubrowser/mainview.cpp
@@ -19,17 +19,17 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 MainView::MainView(QWidget *parent, const char *name, WFlags fl) : QMainWindow(parent, name, fl)
 {
 	setIcon( Resource::loadPixmap( "remote" ) );
 	setCaption(tr("uBrowser"));
 	
 	setToolBarsMovable( false );
 
-	QPEToolBar *toolbar = new QPEToolBar(this, "toolbar");
+	QToolBar *toolbar = new QToolBar(this, "toolbar");
 	back = new QToolButton(Resource::loadPixmap("ubrowser/back"), 0, 0, 0, 0, toolbar, "back");
 	forward = new QToolButton(Resource::loadPixmap("ubrowser/forward"), 0, 0, 0, 0, toolbar, "forward");
 	home = new QToolButton(Resource::loadPixmap("ubrowser/home"), 0, 0, 0, 0, toolbar, "home");
 	location = new QComboBox(true, toolbar, "location");
 	go = new QToolButton(Resource::loadPixmap("ubrowser/go"), 0, 0, 0, 0, toolbar, "go");
 
 	toolbar->setStretchableWidget(location);
 	toolbar->setHorizontalStretchable(true);
diff --git a/noncore/net/ubrowser/mainview.h b/noncore/net/ubrowser/mainview.h
index cc63729..7ce890c 100644
--- a/noncore/net/ubrowser/mainview.h
+++ b/noncore/net/ubrowser/mainview.h
@@ -10,17 +10,17 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
 Public License for more details.
 
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
 #include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/applnk.h>
 
 #include <qapplication.h>
 #include <qmainwindow.h>
 #include <qwidget.h>
 #include <qtextbrowser.h>
 #include <qtoolbutton.h>
 #include <qcombobox.h>
diff --git a/noncore/settings/usermanager/usermanager.cpp b/noncore/settings/usermanager/usermanager.cpp
index 65bbd8b..5c90525 100644
--- a/noncore/settings/usermanager/usermanager.cpp
+++ b/noncore/settings/usermanager/usermanager.cpp
@@ -29,17 +29,17 @@
 UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWindow(parent, name, fl) {
 	setCaption(tr("Opie User Manager"));
 	
 	// Create an instance of the global object 'accounts'. This holds all user/group info, and functions to modify them.
 	accounts=new Passwd();
 	accounts->open();	// This actually loads the files /etc/passwd & /etc/group into memory.
 
 	// Create the toolbar.
-	QPEToolBar *toolbar = new QPEToolBar(this,"Toolbar");
+	QToolBar *toolbar = new QToolBar(this,"Toolbar");
 	toolbar->setHorizontalStretchable(1); // Is there any other way to get the toolbar to stretch of the full screen!?
 	adduserToolButton = new QToolButton(Resource::loadPixmap("usermanager/adduser"),"Add User",0,this,SLOT(addUser()),toolbar,"Add User");
 	edituserToolButton = new QToolButton(Resource::loadPixmap("usermanager/edituser"),"Edit User",0,this,SLOT(editUser()),toolbar,"Edit User");
 	deleteuserToolButton = new QToolButton(Resource::loadPixmap("usermanager/deleteuser"),"Delete User",0,this,SLOT(delUser()),toolbar,"Delete User");
 	QToolButton *userstext = new QToolButton(0,"User",0,0,0,toolbar,"User");
 	userstext->setUsesTextLabel(true);
 	toolbar->addSeparator();
 	addgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/addgroup"),"Add Group",0,this,SLOT(addGroup()),toolbar,"Add Group");
diff --git a/noncore/settings/usermanager/usermanager.h b/noncore/settings/usermanager/usermanager.h
index d7c25b8..678d1f9 100644
--- a/noncore/settings/usermanager/usermanager.h
+++ b/noncore/settings/usermanager/usermanager.h
@@ -11,17 +11,17 @@
 #define USERCONFIG_H
 
 #include <qmainwindow.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 #include <qpopupmenu.h>                       
 #include <qtoolbutton.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 
 #include "userdialog.h"
 #include "groupdialog.h"
 #include "passwd.h"
 
 class UserConfig : public QMainWindow
 {
 	Q_OBJECT
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index a8dd11c..532ee40 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -5,17 +5,17 @@
  **      by:  L. J. Potter
  **
  ****************************************************************************/
 
 #include "formatter.h"
 #include "inputDialog.h"
 #include "output.h"
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/storage.h>
 
diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp
index 114ebfa..8cf8a60 100644
--- a/noncore/unsupported/filebrowser/filebrowser.cpp
+++ b/noncore/unsupported/filebrowser/filebrowser.cpp
@@ -30,17 +30,17 @@
 
 #include <qcopchannel_qws.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qmessagebox.h>
 #include <qdir.h>
 #include <qregexp.h>
 #include <qheader.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
 #include <qaction.h>
 #include <qstringlist.h>
 #include <qcursor.h>
 #include <qmultilineedit.h>
 #include <qfont.h>
 #include <qpainter.h>
@@ -834,17 +834,17 @@ void FileBrowser::init(const QString & dir)
 
     fileView = new FileView( dir, this, 0, showHidden, showSymlinks, showThumbnails );
     fileView->setAllColumnsShowFocus( TRUE );
   fileView->setMenuKeepsOpen(menuKeepsOpen);
   
     setCentralWidget( fileView );
     setToolBarsMovable( FALSE );
 
-    QPEToolBar* toolBar = new QPEToolBar( this );
+    QToolBar* toolBar = new QToolBar( this );
     toolBar->setHorizontalStretchable( TRUE );
 
     QMenuBar* menuBar = new QMenuBar( toolBar );
 
     dirMenu = new QPopupMenu( this );
     menuBar->insertItem( tr( "Dir" ), dirMenu );
 
     sortMenu = new QPopupMenu( this );
@@ -864,17 +864,17 @@ void FileBrowser::init(const QString & dir)
   viewMenu->insertItem( tr( "Symlinks"), this, SLOT( updateShowSymlinks() ) );
   viewMenu->insertItem( tr( "Thumbnails"), this, SLOT( updateShowThumbnails() ) );
     viewMenu->setItemChecked( viewMenu->idAt( 0 ), showHidden );
     viewMenu->setItemChecked( viewMenu->idAt( 1 ), showSymlinks );
     viewMenu->setItemChecked( viewMenu->idAt( 2 ), showThumbnails );
 
   menuBar->insertItem( tr("View"), viewMenu );
     
-    toolBar = new QPEToolBar( this );
+    toolBar = new QToolBar( this );
 
     lastAction = new QAction( tr("Previous dir"), Resource::loadIconSet( "back" ),
                 QString::null, 0, this, 0 );
     connect( lastAction, SIGNAL( activated() ), fileView, SLOT( lastDir() ) );
     lastAction->addTo( toolBar );
     lastAction->setEnabled( FALSE );
 
     upAction = new QAction( tr("Parent dir"), Resource::loadIconSet( "up" ),
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 34d6eb6..94de15c 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -3,30 +3,30 @@
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlayout.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "mailstatusbar.h"
 #include "listviewplus.h"
 #include "composerbase.h"
 
 ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 	setCaption(tr("Compose Message"));
 	setToolBarsMovable(false);
 
-	toolbar = new QPEToolBar(this);
+	toolbar = new QToolBar(this);
 	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);
@@ -120,17 +120,17 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
 	message->setMinimumHeight(30);
 
 	attachWindow = new QMainWindow(view, 0, 0);
 	attachWindow->setMinimumHeight(80);
 	attachWindow->setMaximumHeight(80);
 	attachWindow->setToolBarsMovable(false);
 	attachWindow->hide();
 
-	attachToolbar = new QPEToolBar(attachWindow);
+	attachToolbar = new QToolBar(attachWindow);
 	attachToolbar->setVerticalStretchable(true);
 	
 	addattach = new QAction(tr("Add an Attachement"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
 	addattach->addTo(attachToolbar);
 
 	delattach = new QAction(tr("Remove Attachement"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
 	delattach->addTo(attachToolbar);
 
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h
index 2c832d6..c14144b 100644
--- a/noncore/unsupported/mail2/composerbase.h
+++ b/noncore/unsupported/mail2/composerbase.h
@@ -2,17 +2,17 @@
 #define COMPOSERBASE_H
 
 #include <qmainwindow.h>
 
 class QMultiLineEdit;
 class MailStatusBar;
 class ListViewPlus;
 class QPopupMenu;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
 class QPopupMenu;
 class QComboBox;
 class QLineEdit;
 class QAction;
 class QLabel;
 
 class ComposerBase : public QMainWindow
@@ -37,17 +37,17 @@ protected:
 	static const int POPUP_ATTACH_DESC = 1;
 	static const int POPUP_ATTACH_REMOVE = 2;
 
 	QMultiLineEdit *message;
 	MailStatusBar *status;
 	ListViewPlus *attachView;
 	QMainWindow *attachWindow;
 	QPopupMenu *attachPopup;
-	QPEToolBar *toolbar, *attachToolbar;
+	QToolBar *toolbar, *attachToolbar;
  	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:
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 119acfb..4e804c2 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -1,30 +1,30 @@
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qvbox.h>
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "mainwindowbase.h"
 #include "mailstatusbar.h"
 #include "folderwidget.h"
 #include "mailtable.h"
 
 MainWindowBase::MainWindowBase(QWidget *parent, const char *name, WFlags fl)
 	: QMainWindow(parent, name, fl)
 {
 	setCaption(tr("E-Mail"));
 	setToolBarsMovable(false);
 
-	toolbar = new QPEToolBar(this);
+	toolbar = new QToolBar(this);
 	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 b2e1dc5..c1d6371 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -1,17 +1,17 @@
 #ifndef MAINWINDOWBASE_H
 #define MAINWINDOWBASE_H
 
 #include <qmainwindow.h>
 
 class ServerConnection;
 class MailStatusBar;
 class FolderWidget;
-class QPEToolBar;
+class QToolBar;
 class QMenuBar;
 class QPopupMenu;
 class MailTable;
 class QAction;
 
 class MainWindowBase : public QMainWindow
 {
 	Q_OBJECT
@@ -21,17 +21,17 @@ public:
 
 protected slots:
 	void slotFoldersToggled(bool toggled);
 
 protected:
 	ServerConnection *serverConnection;
 	MailStatusBar *status;
 	FolderWidget *folderView;
-	QPEToolBar *toolbar;
+	QToolBar *toolbar;
  	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 10aa14d..f72026f 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -1,29 +1,29 @@
 #include <qtextbrowser.h>
 #include <qlistview.h>
 #include <qaction.h>
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qpopupmenu.h>
 
 #include <qpe/qpetoolbar.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 
 #include "viewmailbase.h"
 #include "opendiag.h"
 
 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);
+	toolbar = new QToolBar(this);
   menubar = new QMenuBar( toolbar );
   mailmenu = new QPopupMenu( menubar );
   menubar->insertItem( tr( "Mail" ), mailmenu );
 
 	toolbar->setHorizontalStretchable(true);
 	addToolBar(toolbar);
 
 	QLabel *spacer = new QLabel(toolbar);
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index 6e55021..898522e 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -1,32 +1,32 @@
 #ifndef VIEWMAILBASE_H
 #define VIEWMAILBASE_H
 
 #include <qmainwindow.h>
 
 class QAction;
 class OpenDiag;
 class QListView;
-class QPEToolBar;
+class QToolBar;
 class QTextBrowser;
 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;
+	QToolBar *toolbar;
 	QTextBrowser *browser;
 	OpenDiag *openDiag;
  	QMenuBar *menubar;
   QPopupMenu *mailmenu;
 
 protected slots:
 	void slotChangeAttachview(bool state);
 
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 6930d60..a09bc30 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -12,17 +12,17 @@
 
 
 #include "mainwindow.h"
 
 #include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
@@ -77,17 +77,17 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
 	pvDebug(9,"displayList");
   displayList();
 }
 
 void MainWindow::makeMenu()
 {
 
-  QPEToolBar *toolBar = new QPEToolBar( this );
+  QToolBar *toolBar = new QToolBar( this );
   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 );
@@ -137,17 +137,17 @@ void MainWindow::makeMenu()
 			QString::null, 0, this, 0 );
   connect( cfgact, SIGNAL( activated() ),
 	   SLOT( showSettingsDst() ) );
   cfgact->addTo( cfgMenu );
 
   QAction *a;
 
   // SECTIONS
-	sectionBar = new QPEToolBar( this );
+	sectionBar = new QToolBar( this );
  	addToolBar( sectionBar,  "Section", QMainWindow::Top, TRUE );
   sectionBar->setHorizontalStretchable( true );
   QLabel *label = new QLabel( sectionBar, "section" );
 //  label->setBackgroundMode( NoBackground );
  	label->font().setPointSize( 8 );
   label->setText( tr( "Section:" ) ); 	
   sectionBar->setStretchableWidget( label );
   section = new QComboBox( false, sectionBar );
@@ -164,17 +164,17 @@ void MainWindow::makeMenu()
   setSubSections();
   sectionAction = new QAction( tr( "Sections" ), QString::null, 0, this, 0 );
   connect( sectionAction, SIGNAL( toggled(bool) ), this, SLOT( sectionShow(bool) ) );
   sectionAction->setToggleAction( true );
   sectionAction->addTo( viewMenu );
 // 	sectionBar->setStretchableWidget( section );
 
   //FIND
-  findBar = new QPEToolBar(this);
+  findBar = new QToolBar(this);
   addToolBar( findBar,  "Filter", QMainWindow::Top, TRUE );
   label = new QLabel( tr("Filter: "), findBar );
 //  label->setBackgroundMode( PaletteForeground );
   findBar->setHorizontalStretchable( TRUE );
   findEdit = new QLineEdit( findBar, "findEdit" );
   findBar->setStretchableWidget( findEdit );
   connect( findEdit, SIGNAL( textChanged( const QString & ) ),
        this, SLOT( displayList() ) );
@@ -185,17 +185,17 @@ void MainWindow::makeMenu()
   connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
   a->addTo( findBar );
   findAction = new QAction( tr( "Filter" ), QString::null, 0, this, 0 );
   connect( findAction, SIGNAL( toggled(bool) ), this, SLOT( findShow(bool) ) );
   findAction->setToggleAction( true );
   findAction->addTo( viewMenu );
 
   //SEARCH
-  searchBar = new QPEToolBar(this);
+  searchBar = new QToolBar(this);
   addToolBar( searchBar,  "Search", QMainWindow::Top, TRUE );
   label = new QLabel( tr("Search: "), searchBar );
 //  label->setBackgroundMode( PaletteForeground );
   searchBar->setHorizontalStretchable( TRUE );
   searchEdit = new QLineEdit( searchBar, "seachEdit" );
   searchBar->setStretchableWidget( searchEdit );
 //  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
 //       this, SLOT( displayList() ) );
@@ -209,17 +209,17 @@ void MainWindow::makeMenu()
   connect( a, SIGNAL( activated() ), this, SLOT( searchClose() ) );
   a->addTo( searchBar );
   searchAction = new QAction( tr( "Search" ), QString::null, 0, this, 0 );
   connect( searchAction, SIGNAL( toggled(bool) ), this, SLOT( searchShow(bool) ) );
   searchAction->setToggleAction( true );
   searchAction->addTo( viewMenu );
 
   //DEST
-  destBar = new QPEToolBar(this);
+  destBar = new QToolBar(this);
   addToolBar( destBar,  "Destination", QMainWindow::Top, TRUE );
   label = new QLabel( tr("Destination: "), destBar );
 //  label->setBackgroundMode( PaletteForeground );
   destBar->setHorizontalStretchable( TRUE );
   destination = new QComboBox( false, destBar );
   destination->insertStringList( settings->getDestinationNames() );
   setComboName(destination,settings->getDestinationName());
   connect( destination, SIGNAL(activated(int)),
diff --git a/noncore/unsupported/oipkg/mainwindow.h b/noncore/unsupported/oipkg/mainwindow.h
index 7446135..ae9fd0c 100644
--- a/noncore/unsupported/oipkg/mainwindow.h
+++ b/noncore/unsupported/oipkg/mainwindow.h
@@ -23,17 +23,17 @@
 #include "packagelistremote.h"
 #include "packagelistlocal.h"
 #include "packagelistdoclnk.h"
 #include "pmipkg.h"
 #include "pksettings.h"
 #include "packagelistview.h"
 
 class QComboBox;
-class QPEToolBar;
+class QToolBar;
 class QLineEdit;
 class PackageListItem;
 class QCopChannel;
 class QMessageBox;
 class QCheckBox;
 
 class MainWindow : public QMainWindow
 {
@@ -84,25 +84,25 @@ private:
   PackageManagerSettings *settings;
   PackageListLocal  packageListServers;
   PackageListRemote packageListSearch;
   PackageListDocLnk packageListDocLnk;
   PackageListView *listViewPackages;
   QAction *runAction;
   QAction *updateAction;
   QAction *findAction;
-  QPEToolBar *findBar;
+  QToolBar *findBar;
   QLineEdit *findEdit;
   QAction *searchAction;
   QAction *searchCommit;
-  QPEToolBar *searchBar;
+  QToolBar *searchBar;
   QLineEdit *searchEdit;
   QAction *sectionAction;
-  QPEToolBar *sectionBar;
+  QToolBar *sectionBar;
   QComboBox *section;
   QComboBox *subsection;
   QAction *destAction;
-  QPEToolBar *destBar;
+  QToolBar *destBar;
   QComboBox *destination;
   QCheckBox* CheckBoxLink;
 };
 
 #endif
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index de1dcf3..5cdcccf 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -17,17 +17,17 @@
 #include <qpe/resource.h>
 #include <qpe/applnk.h>
 #include <qpe/qcopenvelope_qws.h>
 
 
 #include <qclipboard.h>
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qwidgetstack.h>
 #include <qtimer.h>
 #include <qfileinfo.h>
 #include <qstring.h>
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qlayout.h>