57 files changed, 123 insertions, 123 deletions

diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp
index 97b0a9e..dd35466 100644
--- a/core/apps/embeddedkonsole/commandeditdialog.cpp
+++ b/core/apps/embeddedkonsole/commandeditdialog.cpp
@@ -1,13 +1,13 @@
 //comandeditdialog.cpp
 
 #include "commandeditdialog.h"
 #include "playlistselection.h"
 #include <qstring.h>
 #include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qwidget.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
 #include <qlist.h>
 #include <qtoolbutton.h>
 #include <qvbox.h>
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index d855d90..fff2f68 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -25,13 +25,13 @@
 
 #include <qdir.h>
 #include <qevent.h>
 #include <qdragobject.h>
 #include <qobjectlist.h>
 #include <qtoolbutton.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpushbutton.h>
 #include <qfontdialog.h>
 #include <qglobal.h>
 #include <qpainter.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
@@ -279,13 +279,13 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   tab = new EKNumTabWidget(this);
 
   connect(tab, SIGNAL(currentChanged(QWidget*)), this, SLOT(switchSession(QWidget*)));
 
      // create terminal toolbar ////////////////////////////////////////////////
   setToolBarsMovable( FALSE );
-  QPEToolBar *menuToolBar = new QPEToolBar( this );
+  QToolBar *menuToolBar = new QToolBar( this );
   menuToolBar->setHorizontalStretchable( TRUE );
 
   QMenuBar *menuBar = new QMenuBar( menuToolBar );
 
   fontList = new QPopupMenu( this );
   for(uint i = 0; i < fonts.count(); i++) {
@@ -348,13 +348,13 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   connect( colorMenu, SIGNAL( activated(int) ), this, SLOT( colorMenuIsSelected(int) ));
   connect( scrollMenu, SIGNAL(activated(int)),this,SLOT(scrollMenuSelected(int)));
   connect(editCommandListMenu,SIGNAL(activated(int)),this,SLOT(editCommandListMenuSelected(int)));
 
   menuBar->insertItem( tr("Options"), configMenu );
 
-  QPEToolBar *toolbar = new QPEToolBar( this );
+  QToolBar *toolbar = new QToolBar( this );
 
   QAction *a;
 
   // Button Commands
   a = new QAction( tr("New"), Resource::loadPixmap( "konsole" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( newSession() ) ); a->addTo( toolbar );
@@ -374,13 +374,13 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   a = new QAction( tr("Up"), Resource::loadPixmap( "up" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
   a = new QAction( tr("Down"), Resource::loadPixmap( "down" ), QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
 */
 
-  secondToolBar = new QPEToolBar( this );
+  secondToolBar = new QToolBar( this );
   secondToolBar->setHorizontalStretchable( TRUE );
 
   commonCombo = new QComboBox( secondToolBar );
   commonCombo->setMaximumWidth(236);
 
   editCommandListMenu->insertItem( tr( "Quick Edit" ) );
diff --git a/core/apps/embeddedkonsole/konsole.h b/core/apps/embeddedkonsole/konsole.h
index e9d0e4b..7d5a908 100644
--- a/core/apps/embeddedkonsole/konsole.h
+++ b/core/apps/embeddedkonsole/konsole.h
@@ -27,13 +27,13 @@
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qstrlist.h>
 #include <qintdict.h>
 #include <qptrdict.h>
 #include <qtabwidget.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qcombobox.h>
 #include <qcolor.h>
 
 #include "MyPty.h"
 #include "TEWidget.h"
 #include "TEmuVt102.h"
@@ -48,13 +48,13 @@ class Konsole : public QMainWindow
 public:
   static QString appName() { return QString::fromLatin1("embeddedkonsole"); }
 
   Konsole(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
   ~Konsole();
   void setColLin(int columns, int lines);
-  QPEToolBar *secondToolBar;
+  QToolBar *secondToolBar;
   void show();
   void setColor();
   int lastSelectedMenu;
   int startUp;
 private slots:
   void setDocument(const QString &);
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp
index ed1c165..6f84ae2 100644
--- a/core/apps/helpbrowser/helpbrowser.cpp
+++ b/core/apps/helpbrowser/helpbrowser.cpp
@@ -30,13 +30,13 @@
 
 #include <qstatusbar.h>
 #include <qdragobject.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qtoolbutton.h>
 #include <qiconset.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qstylesheet.h>
@@ -79,17 +79,17 @@ void HelpBrowser::init( const QString& _home )
     setCentralWidget( browser );
     setToolBarsMovable( FALSE );
 
     if ( !_home.isEmpty() )
         browser->setSource( _home );
 
-    QPEToolBar* toolbar = new QPEToolBar( this );
+    QToolBar* toolbar = new QToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
     QMenuBar *menu = new QMenuBar( toolbar );
 
-    toolbar = new QPEToolBar( this );
+    toolbar = new QToolBar( this );
     // addToolBar( toolbar, "Toolbar");
 
     QPopupMenu* go = new QPopupMenu( this );
     backAction = new QAction( tr( "Backward" ), Resource::loadIconSet( "back" ), QString::null, 0, this, 0 );
     connect( backAction, SIGNAL( activated() ), browser, SLOT( backward() ) );
     connect( browser, SIGNAL( backwardAvailable( bool ) ),
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 0e3254f..be18140 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -24,13 +24,13 @@
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qpoint.h>
 #include <qtextstream.h>
 #include <qdatetime.h>
 #include <qclipboard.h>
@@ -179,24 +179,24 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     channel = new QCopChannel( "QPE/Application/textedit", this );
     connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
         this, SLOT(receive(const QCString&, const QByteArray&)) );
 
     setIcon( Resource::loadPixmap( "TextEditor" ) );
 
-    QPEToolBar *bar = new QPEToolBar( this );
+    QToolBar *bar = new QToolBar( this );
     bar->setHorizontalStretchable( true );
     menu = bar;
 
     QMenuBar *mb = new QMenuBar( bar );
     QPopupMenu *file = new QPopupMenu( this );
     QPopupMenu *edit = new QPopupMenu( this );
     QPopupMenu *advancedMenu = new QPopupMenu(this);
 
     font = new QPopupMenu( this );
 
-    bar = new QPEToolBar( this );
+    bar = new QToolBar( this );
     editBar = bar;
 
     QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ),
                               QString::null, 0, this, 0 );
     connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
 //    a->addTo( bar );
@@ -329,13 +329,13 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     //font->insertItem(tr("About"), this, SLOT( doAbout()) );
 
     mb->insertItem( tr( "File" ), file );
     mb->insertItem( tr( "Edit" ), edit );
     mb->insertItem( tr( "View" ), font );
 
-    searchBar = new QPEToolBar(this);
+    searchBar = new QToolBar(this);
     addToolBar( searchBar,  "Search", QMainWindow::Top, true );
 
     searchBar->setHorizontalStretchable( true );
 
     searchEdit = new QLineEdit( searchBar, "searchEdit" );
     searchBar->setStretchableWidget( searchEdit );
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index cfcfd41..5ce53b8 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -19,13 +19,13 @@
 **********************************************************************/
 // code added by L. J. Potter Sat 03-02-2002 06:17:54
 #define QTOPIA_INTERNAL_FSLP
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/fileselector.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/lnkproperties.h>
 #include <qpe/storage.h>
 
 #include <qpe/applnk.h>
@@ -151,20 +151,20 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     setCaption( tr("OpiePlayer") );
     setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) );
 
     setToolBarsMovable( FALSE );
 
       // Create Toolbar
-    QPEToolBar *toolbar = new QPEToolBar( this );
+    QToolBar *toolbar = new QToolBar( this );
     toolbar->setHorizontalStretchable( TRUE );
 
       // Create Menubar
     QMenuBar *menu = new QMenuBar( toolbar );
     menu->setMargin( 0 );
 
-    QPEToolBar *bar = new QPEToolBar( this );
+    QToolBar *bar = new QToolBar( this );
     bar->setLabel( tr( "Play Operations" ) );
 //      d->tbPlayCurList =  new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list",
 //                                        this , SLOT( addSelected()) );
     tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
     tbDeletePlaylist->setFlat(TRUE);
 
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 406ced6..9f668f4 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -33,13 +33,13 @@
 #include <opie/ocontactaccessbackend_vcard.h>
 
 #include <qpe/resource.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/qcopenvelope_qws.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 // #include <qtoolbar.h>
 // #include <qmenubar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 
@@ -87,13 +87,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
         // Settings for Main Menu
         // setToolBarsMovable( false );
         setToolBarsMovable( !m_config.fixedBars() );
         setRightJustification( true );
 
-        QPEToolBar *bar = new QPEToolBar( this );
+        QToolBar *bar = new QToolBar( this );
         bar->setHorizontalStretchable( TRUE );
 
         QMenuBar *mbList = new QMenuBar( bar  );
         mbList->setMargin( 0 );
 
         QPopupMenu *edit = new QPopupMenu( mbList );
@@ -103,13 +103,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         catMenu = new QPopupMenu( this );
         catMenu->setCheckable( TRUE );
         connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) );
         mbList->insertItem( tr("View"), catMenu );
 
         // Create Toolbar
-        listTools = new QPEToolBar( this, "list operations" );
+        listTools = new QToolBar( this, "list operations" );
         listTools->setHorizontalStretchable( true );
         addToolBar( listTools );
         moveToolBar( listTools, m_config.getToolBarPos() );
 
         // View Icons
         m_tableViewButton  = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/listview" ),
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 34bcb2a..9217e95 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -31,13 +31,13 @@
 #include "abview.h"
 #include "abconfig.h"
 
 class ContactEditor;
 class AbLabel;
 class AbTable;
-class QPEToolBar;
+class QToolBar;
 class QPopupMenu;
 class QToolButton;
 class QDialog;
 class Ir;
 class QAction;
 class LetterPicker;
@@ -101,13 +101,13 @@ private slots:
         void slotConfig();
 
 private:
         void populateCategories();
 
         QPopupMenu *catMenu;
-        QPEToolBar *listTools;
+        QToolBar *listTools;
         QToolButton *deleteButton;
         enum Panes { paneList=0, paneView, paneEdit };
         ContactEditor *abEditor;
         LetterPicker *pLabel;
         AbView* m_abView;
         QWidget *listContainer;
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index a040d7c..44f1515 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -38,13 +38,13 @@
 #include <qpe/ir.h>
 #include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
 #include <qpe/timestring.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/tzselect.h>
 #include <qpe/xmlreader.h>
 
 #include <qaction.h>
 #include <qcopchannel_qws.h>
 #include <qdatetime.h>
@@ -97,22 +97,22 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 
         dayView = 0;
         weekView = 0;
         weekLstView = 0;
         monthView = 0;
 
-//    QPEToolBar *bar = new QPEToolBar( this );
+//    QToolBar *bar = new QToolBar( this );
 //    bar->setHorizontalStretchable( TRUE );
 
 //    QMenuBar *mb = new QMenuBar( bar );
 //    mb->setMargin( 0 );
 
 //    QPopupMenu *view = new QPopupMenu( this );
 //    mb->insertItem( tr( "View" ), view );
 
-        QPEToolBar *sub_bar = new QPEToolBar(this);
+        QToolBar *sub_bar = new QToolBar(this);
         sub_bar->setHorizontalStretchable(TRUE);
 
         QActionGroup *g = new QActionGroup( this );
         g->setExclusive( TRUE );
 
         QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, 0, this, 0 );
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 7d436ae..be30415 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -6,13 +6,13 @@
 #include <qpopupmenu.h>
 #include <qtimer.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/ir.h>
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 
 #include "editor.h"
 #include "show.h"
 #include "templatemanager.h"
@@ -87,13 +87,13 @@ void MainWindow::edit( int uid ) {
 void MainWindow::initUI() {
     setToolBarsMovable( false );
 
     m_stack = new QWidgetStack( this );
     setCentralWidget( m_stack );
 
-    m_toolBar = new QPEToolBar( this );
+    m_toolBar = new QToolBar( this );
     m_toolBar->setHorizontalStretchable( TRUE );
 
     QMenuBar* mb = new QMenuBar( m_toolBar );
 
     m_popView    = new QPopupMenu( this );
     m_popSetting = new QPopupMenu( this );
diff --git a/core/pim/datebook2/mainwindow.h b/core/pim/datebook2/mainwindow.h
index 3c22637..33ef864 100644
--- a/core/pim/datebook2/mainwindow.h
+++ b/core/pim/datebook2/mainwindow.h
@@ -10,13 +10,13 @@
 #include "templatemanager.h"
 #include "view.h"
 
 class QAction;
 class QWidgetStack;
 class QPopupMenu;
-class QPEToolBar;
+class QToolBar;
 namespace Datebook {
     class BookManager;
     class Show;
     class Editor;
     class MainWindow : public OPimMainWindow {
         Q_OBJECT
@@ -59,13 +59,13 @@ namespace Datebook {
         void show( int uid );
         void edit( int uid );
         void edit();
         void add( const OPimRecord& );
 
     private:
-        QPEToolBar* toolbar();
+        QToolBar* toolbar();
         QPopupMenu* viewMenu();
         QPopupMenu* settingsMenu();
         QPopupMenu* templateMenu();
         View* currentView();
         BookManager* manager();
         TemplateManager templateManager();
@@ -88,13 +88,13 @@ namespace Datebook {
         bool viewAP()const;
         bool viewStartMonday()const;
         // off view show
     private:
         QList<View> m_view; // the Views.. not autoDelete
         QWidgetStack* m_stack;
-        QPEToolBar *m_toolBar;
+        QToolBar *m_toolBar;
         QPopupMenu* m_popView;
         QPopupMenu* m_popSetting;
         QPopupMenu* m_popTemplate;
         BookManager* m_manager;
         TemplateManager m_tempMan;
         DescriptionManager m_descMan;
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 80738df..07403a1 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -29,13 +29,13 @@
 #include <qregexp.h>
 #include <qwhatsthis.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/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <opie/owait.h>
 
 #include "olistview.h"
@@ -110,14 +110,14 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
    actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
 //   actionWholeWordsOnly->setOn( cfg.readBoolEntry( "whole_words_only", false ) );
 }
 
 void MainWindow::makeMenu()
 {
-   QPEToolBar *toolBar = new QPEToolBar( this );
-   QPEToolBar *searchBar = new QPEToolBar(this);
+   QToolBar *toolBar = new QToolBar( this );
+   QToolBar *searchBar = new QToolBar(this);
    QMenuBar *menuBar = new QMenuBar( toolBar );
    QPopupMenu *searchMenu = new QPopupMenu( menuBar );
 //   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
    QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
    QPopupMenu *searchOptions = new QPopupMenu( cfgMenu );
 
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index 75054f0..bdc6c5f 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -19,13 +19,13 @@
 
 #include <qmap.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 class QAction;
-class QPEToolBar;
+class QToolBar;
 class QHBox;
 class QVBoxLayout;
 class QTextView;
 class QFrame;
 class OListView;
 class OListViewItem;
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp
index 7f40645..d06a405 100644
--- a/core/pim/todo/mainwindow.cpp
+++ b/core/pim/todo/mainwindow.cpp
@@ -209,13 +209,13 @@ void MainWindow::initActions() {
 
     m_bar->insertItem( QWidget::tr("Data") ,m_edit );
     m_bar->insertItem( QWidget::tr("Category"),  m_catMenu );
     m_bar->insertItem( QWidget::tr("Options"), m_options );
 
     m_curQuick = new QuickEditImpl( this, m_quicktask );
-    addToolBar( (QPEToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE );
+    addToolBar( (QToolBar *)m_curQuick->widget(), QWidget::tr( "QuickEdit" ), QMainWindow::Top, TRUE );
     m_curQuick->signal()->connect( this, SLOT(slotQuickEntered() ) );
 
 }
 /* m_curCat from Config */
 void MainWindow::initConfig() {
     Config config( "todo" );
diff --git a/core/pim/todo/quickeditimpl.cpp b/core/pim/todo/quickeditimpl.cpp
index 70e0582..1863ef4 100644
--- a/core/pim/todo/quickeditimpl.cpp
+++ b/core/pim/todo/quickeditimpl.cpp
@@ -8,13 +8,13 @@
 
 #include "mainwindow.h"
 #include "quickeditimpl.h"
 
 
 QuickEditImpl::QuickEditImpl( QWidget* parent, bool visible )
-    : QPEToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) {
+    : QToolBar( (QMainWindow *)parent ), Todo::QuickEdit( (Todo::MainWindow *)parent ) {
     setHorizontalStretchable( TRUE );
 
     // Load priority icons
     // TODO - probably should be done globally somewhere else,
     //        see also tableview.cpp/h, taskeditoroverview.cpp/h
     priority1 = Resource::loadPixmap( "todo/priority1" );
diff --git a/core/pim/todo/quickeditimpl.h b/core/pim/todo/quickeditimpl.h
index 1253f3d..89b94f8 100644
--- a/core/pim/todo/quickeditimpl.h
+++ b/core/pim/todo/quickeditimpl.h
@@ -1,19 +1,19 @@
 #ifndef OPIE_QUICK_EDIT_IMPL_H
 #define OPIE_QUICK_EDIT_IMPL_H
 
 #include <qpixmap.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 
 #include "quickedit.h"
 
 class QLineEdit;
 class QLabel;
 
-class QuickEditImpl : public QPEToolBar, public Todo::QuickEdit {
+class QuickEditImpl : public QToolBar, public Todo::QuickEdit {
     Q_OBJECT
 public:
     QuickEditImpl( QWidget* parent,  bool visible);
     ~QuickEditImpl();
     OTodo todo()const;
     QWidget* widget();
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
@@ -33,13 +33,13 @@
 #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>
@@ -61,19 +61,19 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
     _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 );
 
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
@@ -16,13 +16,13 @@
 #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
 {
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
@@ -15,13 +15,13 @@
 #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>
@@ -60,13 +60,13 @@ Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     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);
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
@@ -19,23 +19,23 @@
 
 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:
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
@@ -19,13 +19,13 @@
 **********************************************************************/
 #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>
@@ -251,14 +251,14 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
 #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" );
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
@@ -41,13 +41,13 @@
 
 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;
@@ -377,13 +377,13 @@ private slots:
 #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

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
@@ -460,13 +460,13 @@ void MainWindow::initMenu()
   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);
@@ -475,13 +475,13 @@ void MainWindow::initStandardToolbar()
   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);
@@ -497,13 +497,13 @@ void MainWindow::initFunctionsToolbar()
   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);
 
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
@@ -15,13 +15,13 @@
 #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>
@@ -38,13 +38,13 @@ 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;
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
@@ -30,13 +30,13 @@
 /* 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>
@@ -89,13 +89,13 @@ TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f
     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");
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,12 +1,12 @@
 #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>
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
@@ -12,13 +12,13 @@
 #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)
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
@@ -27,13 +27,13 @@
 #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>
 
@@ -45,13 +45,13 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name)
 
   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);
 
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
@@ -23,13 +23,13 @@
 #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>
@@ -55,13 +55,13 @@ 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 );
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
@@ -211,13 +211,13 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags )
 {
     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");
 
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
@@ -22,13 +22,13 @@
 #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>
@@ -240,13 +240,13 @@ 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() ) );
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
@@ -42,13 +42,13 @@ ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) :
 
     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,
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
@@ -42,13 +42,13 @@ SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) :
 
     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");
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
@@ -24,13 +24,13 @@
 #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>
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
@@ -131,13 +131,13 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) :
     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);
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
@@ -33,13 +33,13 @@
 #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>
@@ -61,13 +61,13 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     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()));
@@ -100,13 +100,13 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     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." ) );
 
@@ -117,18 +117,18 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
 
     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." ) );
 
@@ -156,13 +156,13 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
     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." ) );
 
 
@@ -233,19 +233,19 @@ DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
 
     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);
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
@@ -33,13 +33,13 @@ HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* par
     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 );
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
@@ -33,13 +33,13 @@
 #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>
@@ -225,13 +225,13 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     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;
 
@@ -311,13 +311,13 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     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);
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
@@ -31,13 +31,13 @@
 #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;
@@ -245,14 +245,14 @@ private:
 
     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;
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
@@ -16,13 +16,13 @@
 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>
@@ -66,13 +66,13 @@ OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
     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);
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
@@ -28,13 +28,13 @@ 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;
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,7 +1,7 @@
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpopupmenu.h>
 #include <qwhatsthis.h>
 
 #include "mainwindow.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
@@ -21,13 +21,13 @@ MainView::MainView(QWidget *parent, const char *name, WFlags fl) : QMainWindow(p
 {
         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");
 
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
@@ -12,13 +12,13 @@ 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>
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
@@ -31,13 +31,13 @@ UserConfig::UserConfig(QWidget* parent, const char* name, WFlags fl) : QMainWind
         
         // 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);
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
@@ -13,13 +13,13 @@
 #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
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
@@ -7,13 +7,13 @@
  ****************************************************************************/
 
 #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>
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
@@ -32,13 +32,13 @@
 #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>
@@ -836,13 +836,13 @@ void FileBrowser::init(const QString & dir)
     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 );
@@ -866,13 +866,13 @@ void FileBrowser::init(const QString & dir)
     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 );
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
@@ -5,26 +5,26 @@
 #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);
 
@@ -122,13 +122,13 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
         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);
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
@@ -4,13 +4,13 @@
 #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;
@@ -39,13 +39,13 @@ protected:
 
         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;
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
@@ -2,13 +2,13 @@
 #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"
@@ -16,13 +16,13 @@
 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 );
 
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
@@ -3,13 +3,13 @@
 
 #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
@@ -23,13 +23,13 @@ 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;
 
 };
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
@@ -3,25 +3,25 @@
 #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);
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
@@ -3,13 +3,13 @@
 
 #include <qmainwindow.h>
 
 class QAction;
 class OpenDiag;
 class QListView;
-class QPEToolBar;
+class QToolBar;
 class QTextBrowser;
 class QMenuBar;
 class QPopupMenu;
 
 class ViewMailBase : public QMainWindow
 {
@@ -18,13 +18,13 @@ class ViewMailBase : public QMainWindow
 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:
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
@@ -14,13 +14,13 @@
 #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>
@@ -79,13 +79,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   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 );
 
@@ -139,13 +139,13 @@ void MainWindow::makeMenu()
            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:" ) ); 
@@ -166,13 +166,13 @@ void MainWindow::makeMenu()
   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 );
@@ -187,13 +187,13 @@ void MainWindow::makeMenu()
   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 );
@@ -211,13 +211,13 @@ void MainWindow::makeMenu()
   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() );
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
@@ -25,13 +25,13 @@
 #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;
 
@@ -86,23 +86,23 @@ private:
   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
@@ -19,13 +19,13 @@
 #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>