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,55 +1,55 @@
 //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>
 #include <qlistview.h>
 #include <qlineedit.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include "smallcommandeditdialogbase.h"
 CommandEditDialog::CommandEditDialog(QWidget *parent, const char* name, WFlags fl )
    : CommandEditDialogBase(parent, name, TRUE, fl)
 {
  m_SuggestedCommandList->addColumn( tr("Command Selection") );
  m_SuggestedCommandList->header()->hide();
  m_SuggestedCommandList->setSorting(-1,FALSE);
  m_SuggestedCommandList->clearSelection();
  m_SuggestedCommandList->setSorting(0,TRUE);
  QListViewItem *item;
  item = new QListViewItem( m_SuggestedCommandList,"export ");
  item = new QListViewItem( m_SuggestedCommandList,"ifconfig ");
  item = new QListViewItem( m_SuggestedCommandList,"ipkg ");
  item = new QListViewItem( m_SuggestedCommandList,"gzip ");
  item = new QListViewItem( m_SuggestedCommandList,"gunzip ");
  item = new QListViewItem( m_SuggestedCommandList,"chgrp ");
  item = new QListViewItem( m_SuggestedCommandList,"chown ");
  item = new QListViewItem( m_SuggestedCommandList,"date ");
  item = new QListViewItem( m_SuggestedCommandList,"dd ");
  item = new QListViewItem( m_SuggestedCommandList,"dmesg ");
  item = new QListViewItem( m_SuggestedCommandList,"fuser ");
  item = new QListViewItem( m_SuggestedCommandList,"hostname ");
  item = new QListViewItem( m_SuggestedCommandList,"kill ");
  item = new QListViewItem( m_SuggestedCommandList,"killall ");
  item = new QListViewItem( m_SuggestedCommandList,"ln ");
  item = new QListViewItem( m_SuggestedCommandList,"ln -s ");
  item = new QListViewItem( m_SuggestedCommandList,"lsmod");
  item = new QListViewItem( m_SuggestedCommandList,"depmod -a");
  item = new QListViewItem( m_SuggestedCommandList,"modprobe ");
  item = new QListViewItem( m_SuggestedCommandList,"mount ");
  item = new QListViewItem( m_SuggestedCommandList,"more ");
  item = new QListViewItem( m_SuggestedCommandList,"sort ");
  item = new QListViewItem( m_SuggestedCommandList,"touch ");
  item = new QListViewItem( m_SuggestedCommandList,"umount ");
  item = new QListViewItem( m_SuggestedCommandList,"mknod ");
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
@@ -1,79 +1,79 @@
 /* ---------------------------------------------------------------------- */
 /*                                                                        */
 /* [main.C]                        Konsole                                */
 /*                                                                        */
 /* ---------------------------------------------------------------------- */
 /*                                                                        */
 /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>        */
 /*                                                                        */
 /* This file is part of Konsole, an X terminal.                           */
 /*                                                                        */
 /* The material contained in here more or less directly orginates from    */
 /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org> */
 /*                                                                        */
 /* ---------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 // enhancements added by L.J. Potter <ljp@llornkcor.com>
 #define QT_QWS_OPIE
 #include <qpe/resource.h>
 #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>
 #include <qaction.h>
 #include <qapplication.h>
 #include <qfontmetrics.h>
 #include <qcombobox.h>
 #include <qevent.h>
 #include <qtabwidget.h>
 #include <qtabbar.h>
 #include <qpe/config.h>
 #include <qstringlist.h>
 #include <qpalette.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
 #include "konsole.h"
 #include "keytrans.h"
 #include "commandeditdialog.h"
 #ifdef  QT_QWS_OPIE
 #include <opie/colorpopupmenu.h>
 #endif
 class EKNumTabBar : public QTabBar {
 public:
    void numberTabs()
    {
  // Yes, it really is this messy. QTabWidget needs functions
  // that provide acces to tabs in a sequential way.
  int m=INT_MIN;
  for (int i=0; i<count(); i++) {
      QTab* left=0;
      QListIterator<QTab> it(*tabList());
      int x=INT_MAX;
      for( QTab* t; (t=it.current()); ++it ) {
    int tx = t->rect().x();
    if ( tx<x && tx>m ) {
        x = tx;
@@ -237,192 +237,192 @@ void Konsole::initCommandList()
            commonCombo->insertItem(commonCmds[i],i);
        }
    } else {
        for (int i = 0; i < 100; i++) {
            if (!(cfg.readEntry( QString::number(i),"")).isEmpty())
                commonCombo->insertItem((cfg.readEntry( QString::number(i),"")));
        }
    }
 }
 void Konsole::init(const char* _pgm, QStrList & _args)
 {
  b_scroll = TRUE; // histon;
  n_keytab = 0;
  n_render = 0;
  startUp=0;
  fromMenu = FALSE;
  setCaption( tr("Terminal") );
  setIcon( Resource::loadPixmap( "konsole" ) );
  Config cfg("Konsole");
  cfg.setGroup("Konsole");
  QString tmp;
  // initialize the list of allowed fonts ///////////////////////////////////
  cfont = cfg.readNumEntry("FontID", 1);
  QFont f = QFont("Micro", 4, QFont::Normal);
  f.setFixedPitch(TRUE);
  fonts.append(new VTFont(tr("Micro"), f));
  f = QFont("Fixed", 7, QFont::Normal);
  f.setFixedPitch(TRUE);
  fonts.append(new VTFont(tr("Small Fixed"), f));
  f = QFont("Fixed", 12, QFont::Normal);
  f.setFixedPitch(TRUE);
  fonts.append(new VTFont(tr("Medium Fixed"), f));
  // create terminal emulation framework ////////////////////////////////////
  nsessions = 0;
  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++) {
    VTFont *fnt = fonts.at(i);
    fontList->insertItem(fnt->getName(), i);
  }
  fontChanged(cfont);
  configMenu = new QPopupMenu( this);
  colorMenu = new QPopupMenu( this);
  scrollMenu = new QPopupMenu( this);
  editCommandListMenu = new QPopupMenu( this);
  configMenu->insertItem(tr("Command List"), editCommandListMenu);
  bool listHidden;
  cfg.setGroup("Menubar");
  if( cfg.readEntry("Hidden","FALSE") == "TRUE")  {
      editCommandListMenu->insertItem( tr( "Show command list" ));
      listHidden=TRUE;
  } else {
      editCommandListMenu->insertItem( tr( "Hide command list" ));
      listHidden=FALSE;
  }
  cfg.setGroup("Tabs");
  tmp=cfg.readEntry("Position","Bottom");
  if(tmp=="Top") {
      tab->setTabPosition(QTabWidget::Top);
      configMenu->insertItem( tr( "Tabs on Bottom" ) );
  } else {
      tab->setTabPosition(QTabWidget::Bottom);
      configMenu->insertItem(tr("Tabs on Top"));
  }
  configMenu->insertSeparator(2);
  colorMenu->insertItem(tr( "Green on Black"));
  colorMenu->insertItem(tr( "Black on White"));
  colorMenu->insertItem(tr( "White on Black"));
  colorMenu->insertItem(tr( "Black on Transparent"));
  colorMenu->insertItem(tr( "Black on Red"));
  colorMenu->insertItem(tr( "Red on Black"));
  colorMenu->insertItem(tr( "Green on Yellow"));
  colorMenu->insertItem(tr( "Blue on Magenta"));
  colorMenu->insertItem(tr( "Magenta on Blue"));
  colorMenu->insertItem(tr( "Cyan on White"));
  colorMenu->insertItem(tr( "White on Cyan"));
  colorMenu->insertItem(tr( "Blue on Black"));
  colorMenu->insertItem(tr( "Amber on Black"));
 #ifdef QT_QWS_OPIE
  colorMenu->insertItem(tr( "Custom"));
 #endif
  configMenu->insertItem( tr("Font"), fontList );
  configMenu->insertItem(tr( "Colors") ,colorMenu);
  connect( fontList, SIGNAL( activated(int) ), this, SLOT( fontChanged(int) ));
  connect( configMenu, SIGNAL( activated(int) ), this, SLOT( configMenuSelected(int) ));
  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 );
  a = new QAction( tr("Enter"), Resource::loadPixmap( "konsole/enter" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), this, SLOT( hitEnter() ) ); a->addTo( toolbar );
  a = new QAction( tr("Space"), Resource::loadPixmap( "konsole/space" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), this, SLOT( hitSpace() ) ); a->addTo( toolbar );
  a = new QAction( tr("Tab"), Resource::loadPixmap( "konsole/tab" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), this, SLOT( hitTab() ) ); a->addTo( toolbar );
  a = new QAction( tr("Up"), Resource::loadPixmap( "konsole/up" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), this, SLOT( hitUp() ) ); a->addTo( toolbar );
  a = new QAction( tr("Down"), Resource::loadPixmap( "konsole/down" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), this, SLOT( hitDown() ) ); a->addTo( toolbar );
  a = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), this, SLOT( hitPaste() ) ); a->addTo( toolbar );
 /*
  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" ) );
  if( listHidden) {
      secondToolBar->hide();
      editCommandListMenu->setItemEnabled(-23 ,FALSE);
  }
  editCommandListMenu->insertItem(tr(  "Edit" ) );
  cfg.setGroup("Commands");
  commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
  initCommandList();
 //   for (int i = 0; commonCmds[i] != NULL; i++) {
 //        commonCombo->insertItem( commonCmds[i], i );
 //        tmp = cfg.readEntry( QString::number(i),"");
 //        if(tmp != "")
 //            commonCombo->changeItem( tmp,i );
 //    }
  connect( commonCombo, SIGNAL( activated(int) ), this, SLOT( enterCommand(int) ));
  scrollMenu->insertItem(tr( "None" ));
  scrollMenu->insertItem(tr( "Left" ));
  scrollMenu->insertItem(tr( "Right" ));
 //   scrollMenu->insertSeparator(4);
 //   scrollMenu->insertItem(tr( "Horizontal" ));
  configMenu->insertItem(tr( "ScrollBar" ),scrollMenu);
  int jut = configMenu->insertItem(tr( "Wrap" ));
    cfg.setGroup("ScrollBar");
  configMenu->setItemChecked(jut, cfg.readBoolEntry("HorzScroll",0));
  jut = configMenu->insertItem(tr( "Use Beep" ));
  cfg.setGroup("Menubar");
  configMenu->setItemChecked(jut, cfg.readBoolEntry("useBeep",0));
 //scrollMenuSelected(-29);
 //   cfg.setGroup("ScrollBar");
 //   if(cfg.readBoolEntry("HorzScroll",0)) {
 //       if(cfg.readNumEntry("Position",2) == 0)
 //           te->setScrollbarLocation(1);
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
@@ -1,102 +1,102 @@
 /* ----------------------------------------------------------------------- */
 /*                                                                         */
 /* [konsole.h]                      Konsole                                   */
 /*                                                                            */
 /* -------------------------------------------------------------------------- */
 /*                                                                            */
 /* Copyright (c) 1997,1998 by Lars Doelle <lars.doelle@on-line.de>            */
 /*                                                                            */
 /* This file is part of Konsole, an X terminal.                               */
 /*                                                                            */
 /* The material contained in here more or less directly orginates from        */
 /* kvt, which is copyright (c) 1996 by Matthias Ettrich <ettrich@kde.org>     */
 /*                                                                            */
 /* -------------------------------------------------------------------------- */
 /*                        */
 /* Ported Konsole to Qt/Embedded                                              */
 /*                        */
 /* Copyright (C) 2000 by John Ryland <jryland@trolltech.com>                  */
 /*                        */
 /* -------------------------------------------------------------------------- */
 #ifndef KONSOLE_H
 #define KONSOLE_H
 #include <qmainwindow.h>
 #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"
 #include "session.h"
 class EKNumTabWidget;
 class Konsole : public QMainWindow
 {
    Q_OBJECT
 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 &);
  void doneSession(TESession*,int);
  void changeColumns(int);
  void fontChanged(int);
  void configMenuSelected(int );
  void colorMenuSelected(int);
  void colorMenuIsSelected(int);
  void enterCommand(int);
  void hitEnter();
  void hitSpace();
  void hitTab();
  void hitPaste();
  void hitUp();
  void hitDown();
  void switchSession(QWidget *);
  void newSession();
  void changeCommand(const QString &, int);
  void initCommandList();
  void scrollMenuSelected(int);
  void editCommandListMenuSelected(int);
  void parseCommandLine();
    void changeForegroundColor(const QColor &);
    void changeBackgroundColor(const QColor &);
 private:
    void doWrap();
  void init(const char* _pgm, QStrList & _args);
  void initSession(const char* _pgm, QStrList & _args);
  void runSession(TESession* s);
  void setColorPixmaps();
  void setHistory(bool);
  QSize calcSize(int columns, int lines);
  TEWidget* getTe();
  QStringList commands;
  QLabel * msgLabel;
  QColor foreground, background;
 bool fromMenu;
 private:
  class VTFont
  {
  public:
    VTFont(QString name, QFont& font)
    {
      this->name = name;
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
@@ -1,137 +1,137 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_LANGLIST
 #include "helpbrowser.h"
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/global.h>
 #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>
 #include <qmessagebox.h>
 #include <qfiledialog.h>
 #include <qevent.h>
 #include <qlineedit.h>
 #include <qobjectlist.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qdatastream.h>
 #include <qprinter.h>
 #include <qsimplerichtext.h>
 #include <qpaintdevicemetrics.h>
 #include <qaction.h>
 #include <cctype>
 #include "magictextbrowser.h"
 HelpBrowser::HelpBrowser( QWidget* parent, const char *name, WFlags f )
    : QMainWindow( parent, name, f ),
      selectedURL()
 {
    init( "index.html" );
 }
 void HelpBrowser::init( const QString& _home )
 {
    setIcon( Resource::loadPixmap( "HelpBrowser" ) );
    setBackgroundMode( PaletteButton );
    browser = new MagicTextBrowser( this );
    browser->setFrameStyle( QFrame::Panel | QFrame::Sunken );
    connect( browser, SIGNAL( textChanged() ),
             this, SLOT( textChanged() ) );
    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 ) ),
             backAction, SLOT( setEnabled( bool ) ) );
    backAction->addTo( go );
    backAction->addTo( toolbar );
    backAction->setEnabled( FALSE );
    forwardAction = new QAction( tr( "Forward" ), Resource::loadIconSet( "forward" ), QString::null, 0, this, 0 );
    connect( forwardAction, SIGNAL( activated() ), browser, SLOT( forward() ) );
    connect( browser, SIGNAL( forwardAvailable( bool ) ),
             forwardAction, SLOT( setEnabled( bool ) ) );
    forwardAction->addTo( go );
    forwardAction->addTo( toolbar );
    forwardAction->setEnabled( FALSE );
    QAction *a = new QAction( tr( "Home" ), Resource::loadIconSet( "home" ), QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), browser, SLOT( home() ) );
    a->addTo( go );
    a->addTo( toolbar );
    bookm = new QPopupMenu( this );
    bookm->insertItem( tr( "Add Bookmark" ), this, SLOT( addBookmark() ) );
    bookm->insertItem( tr( "Remove from Bookmarks" ), this, SLOT( removeBookmark() ) );
    bookm->insertSeparator();
    connect( bookm, SIGNAL( activated( int ) ),
             this, SLOT( bookmChosen( int ) ) );
    readBookmarks();
    menu->insertItem( tr("Go"), go );
    menu->insertItem( tr( "Bookmarks" ), bookm );
    resize( 240, 300 );
    browser->setFocus();
    browser->setFrameStyle( QFrame::NoFrame );
 #if !defined(QT_NO_COP)
        QCopChannel *addressChannel = new QCopChannel("QPE/HelpBrowser" , this );
        connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
                 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
 #endif
    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)),
             this, SLOT(appMessage(const QCString&, const QByteArray&)) );
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
@@ -1,78 +1,78 @@
 /**********************************************************************
 // textedit.cpp
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Opie Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 **********************************************************************/
 // changes added by L. J. Potter Sun 02-17-2002 21:31:31
 #include "textedit.h"
 #include "filePermissions.h"
 #include <opie/ofileselector.h>
 #include <opie/ofiledialog.h>
 #include <opie/ofontselector.h>
 #include <qpe/fontdatabase.h>
 #include <qpe/global.h>
 #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>
 #include <qstringlist.h>
 #include <qaction.h>
 #include <qcolordialog.h>
 #include <qfileinfo.h>
 #include <qlineedit.h>
 #include <qmessagebox.h>
 #include <qobjectlist.h>
 #include <qpopupmenu.h>
 #include <qspinbox.h>
 #include <qtoolbutton.h>
 #include <qwidgetstack.h>
 #include <qcheckbox.h>
 #include <qcombo.h>
 #include <qlayout.h>
 #include <qapplication.h>
 #include <qtimer.h>
 #include <qdir.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdlib.h> //getenv
 #if QT_VERSION < 300
 class QpeEditor : public QMultiLineEdit
 {
 public:
    QpeEditor( QWidget *parent, const char * name = 0 )
            : QMultiLineEdit( parent, name ) {
        clearTableFlags();
        setTableFlags( Tbl_vScrollBar | Tbl_autoHScrollBar );
 }
    void find( const QString &txt, bool caseSensitive,
                            bool backwards );
 protected:
    bool markIt;
    int line1, line2, col1, col2;
    void mousePressEvent( QMouseEvent * );
    void mouseReleaseEvent( QMouseEvent * );
 //public slots:
@@ -137,108 +137,108 @@ void QpeEditor::find ( const QString &txt, bool caseSensitive,
        for ( ; ; ) {
            if ( line >= numLines() ) {
                wrap = true;
                  //emit notFound();
                break;
            }
            int findCol = getString( line )->find( txt, col, caseSensitive );
            if ( findCol >= 0 ) {
                setCursorPosition( line, findCol, false );
                col = findCol + txt.length();
                setCursorPosition( line, col, true );
                  //found = true;
                break;
            }
            line++;
            col = 0;
        }
    }
 }
 #else
 #error "Must make a QpeEditor that inherits QTextEdit"
 #endif
 static const int nfontsizes = 6;
 static const int fontsize[nfontsizes] = {8,10,12,14,18,24};
 TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
    : QMainWindow( parent, name, f ), bFromDocView( false )
 {
    doc = 0;
    edited=false;
    fromSetDocument=false;
    setToolBarsMovable( false );
    connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
    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 );
    a->addTo( file );
    a = new QAction( tr( "Open" ), Resource::loadPixmap( "fileopen" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( fileOpen() ) );
    a->addTo( bar );
    a->addTo( file );
    a = new QAction( tr( "Save" ), Resource::loadPixmap("save") ,
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( save() ) );
    file->insertSeparator();
    a->addTo( bar );
    a->addTo( file );
    a = new QAction( tr( "Save As" ),  Resource::loadPixmap("save") ,
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( saveAs() ) );
    a->addTo( file );
    a = new QAction( tr( "Cut" ), Resource::loadPixmap( "cut" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( editCut() ) );
    a->addTo( editBar );
    a->addTo( edit );
    a = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( editCopy() ) );
    a->addTo( editBar );
    a->addTo( edit );
    a = new QAction( tr( "Paste" ), Resource::loadPixmap( "paste" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( editPaste() ) );
    a->addTo( editBar );
    a->addTo( edit );
 #ifndef QT_NO_CLIPBOARD
    a = new QAction( tr( "Insert Time and Date" ), Resource::loadPixmap( "paste" ),
                     QString::null, 0, this, 0 );
@@ -287,97 +287,97 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
    nStart->setToggleAction(true);
    nStart->addTo( advancedMenu );
    nStart->setEnabled(false);
    nAdvanced = new QAction( tr("Prompt on Exit"),
                             QString::null, 0, this, 0 );
    connect( nAdvanced, SIGNAL( toggled(bool) ),
             this, SLOT( doPrompt(bool) ) );
    nAdvanced->setToggleAction(true);
    nAdvanced->addTo( advancedMenu );
    desktopAction = new QAction( tr("Always open linked file"),
                                 QString::null, 0, this, 0 );
    connect( desktopAction, SIGNAL( toggled(bool) ),
             this, SLOT( doDesktop(bool) ) );
    desktopAction->setToggleAction(true);
    desktopAction->addTo( advancedMenu);
    filePermAction = new QAction( tr("File Permissions"),
                                  QString::null, 0, this, 0 );
    connect( filePermAction, SIGNAL( toggled(bool) ),
             this, SLOT( doFilePerms(bool) ) );
    filePermAction->setToggleAction(true);
    filePermAction->addTo( advancedMenu);
    searchBarAction = new QAction( tr("Search Bar Open"),
                                   QString::null, 0, this, 0 );
    connect( searchBarAction, SIGNAL( toggled(bool) ),
             this, SLOT( setSearchBar(bool) ) );
    searchBarAction->setToggleAction(true);
    searchBarAction->addTo( advancedMenu);
    nAutoSave = new QAction( tr("Auto Save 5 min."),
                                   QString::null, 0, this, 0 );
    connect( nAutoSave, SIGNAL( toggled(bool) ),
             this, SLOT( doTimer(bool) ) );
    nAutoSave->setToggleAction(true);
    nAutoSave->addTo( advancedMenu);
    //font->insertSeparator();
    //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 );
    connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
       this, SLOT( search() ) );
    a = new QAction( tr( "Find Next" ), Resource::loadPixmap( "next" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( findNext() ) );
    a->addTo( searchBar );
    a->addTo( edit );
    a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( findClose() ) );
    a->addTo( searchBar );
    edit->insertSeparator();
    a = new QAction( tr( "Delete" ), Resource::loadPixmap( "close" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( editDelete() ) );
    a->addTo( edit );
    searchBar->hide();
    editor = new QpeEditor( this );
    setCentralWidget( editor );
    editor->setFrameStyle( QFrame::Panel | QFrame::Sunken );
    connect( editor, SIGNAL( textChanged() ),
             this, SLOT( editorChanged() ) );
    QPEApplication::setStylusOperation( editor, QPEApplication::RightOnHold);
    Config cfg("TextEdit");
    cfg. setGroup ( "Font" );
    QFont defaultFont = editor-> font ( );
    QString family = cfg. readEntry     ( "Family", defaultFont. family ( ));
    int size       = cfg. readNumEntry  ( "Size",   defaultFont. pointSize ( ));
    int weight     = cfg. readNumEntry  ( "Weight", defaultFont. weight ( ));
    bool italic    = cfg. readBoolEntry ( "Italic", defaultFont. italic ( ));
    defaultFont = QFont ( family, size, weight, italic );
    editor-> setFont ( defaultFont );
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
@@ -1,73 +1,73 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 // 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>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <qpe/resource.h>
 #include <qaction.h>
 #include <qcursor.h>
 #include <qimage.h>
 #include <qfile.h>
 #include <qdir.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qlist.h>
 #include <qlistbox.h>
 #include <qmainwindow.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qlistview.h>
 #include <qpoint.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 //#include <qtimer.h>
 #include "playlistselection.h"
 #include "playlistwidget.h"
 #include "mediaplayerstate.h"
 #include "inputDialog.h"
 #include <stdlib.h>
 #include "audiowidget.h"
 #include "videowidget.h"
 #include <unistd.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 // for setBacklight()
 #include <linux/fb.h>
@@ -109,104 +109,104 @@ class ToolButton : public QToolButton {
 public:
    ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
            : QToolButton( parent, name ) {
        setTextLabel( name );
        setPixmap( Resource::loadPixmap( icon ) );
        setAutoRaise( TRUE );
        setFocusPolicy( QWidget::NoFocus );
        setToggleButton( t );
        connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
        QPEMenuToolFocusManager::manager()->addWidget( this );
    }
 };
 class MenuItem : public QAction {
 public:
    MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
            : QAction( text, QString::null, 0, 0 ) {
        connect( this, SIGNAL( activated() ), handler, slot );
        addTo( parent );
    }
 };
 PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
        : QMainWindow( parent, name, fl ) {
    d = new PlayListWidgetPrivate;
    d->setDocumentUsed = FALSE;
    d->current = NULL;
    fromSetDocument = FALSE;
    insanityBool=FALSE;
    audioScan = FALSE;
    videoScan = FALSE;
 //    menuTimer = new QTimer( this ,"menu timer"),
 //     connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
    channel = new QCopChannel( "QPE/Application/opieplayer", this );
    connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
        this, SLOT( qcopReceive(const QCString&, const QByteArray&)) );
    setBackgroundMode( PaletteButton );
    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);
    tbDeletePlaylist->setFixedSize(20,20);
    
    d->tbAddToList =  new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist",
                                      this , SLOT(addSelected()) );
    d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
                                          this , SLOT(removeSelected()) );
 //    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE );
    d->tbPlay    = new ToolButton( bar, tr( "Play" ), "opieplayer/play",
                                   this , SLOT( btnPlay(bool) ), TRUE );
    d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle",
                                   mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
    d->tbLoop    = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop",
                                   mediaPlayerState, SLOT(setLooping(bool)), TRUE );
    tbDeletePlaylist->hide();
    QPopupMenu *pmPlayList = new QPopupMenu( this );
    menu->insertItem( tr( "File" ), pmPlayList );
    new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
    new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) );
    new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) );
    new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
    pmPlayList->insertSeparator(-1);
    new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
    new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
    pmPlayList->insertSeparator(-1);
    new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) );
    new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) );
    QPopupMenu *pmView = new QPopupMenu( this );
    menu->insertItem( tr( "View" ), pmView );
    fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
    fullScreenButton->addTo(pmView);
    scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0);
    scaleButton->addTo(pmView);
    skinsMenu = new QPopupMenu( this );
    menu->insertItem( tr( "Skins" ), skinsMenu );
    skinsMenu->isCheckable();
    connect( skinsMenu, SIGNAL( activated( int ) ) ,
             this, SLOT( skinsMenuActivated( int ) ) );
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
@@ -1,157 +1,157 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file is part of the Open Palmtop Environment (see www.opie.info).
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_FD
 #include "contacteditor.h"
 #include "ablabel.h"
 #include "abview.h"
 #include "abtable.h"
 // #include "addresssettings.h"
 #include "addressbook.h"
 #include <opie/ofileselector.h>
 #include <opie/ofiledialog.h>
 #include <opie/ocontact.h>
 #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>
 #include <qaction.h>
 #include <qdialog.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qimage.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
 #include <qstringlist.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
 #include <qdatetime.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include "picker.h"
 #include "configdlg.h"
 extern QString addressbookPersonalVCardName();
 AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
                                      WFlags f )
        : QMainWindow( parent, name, f ),
          catMenu (0l),
          abEditor(0l),
          syncing(FALSE),
          m_tableViewButton(0l),
          m_cardViewButton(0l)
 {
        isLoading = true;
        m_config.load();
        setCaption( tr("Contacts") );
        setIcon( Resource::loadPixmap( "AddressBook" ) );
        // 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 );
        mbList->insertItem( tr( "Contact" ), edit );
        // Category Menu
        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" ),
                                          QString::null, 0, this, 0 );
        connect( m_tableViewButton, SIGNAL( activated() ), this, SLOT( slotListView() ) );
        m_tableViewButton->setToggleAction( true );
        m_tableViewButton->addTo( listTools );
        m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "addressbook/cardview" ),  QString::null, 0, this, 0 );
        connect( m_cardViewButton, SIGNAL( activated() ), this, SLOT( slotCardView() ) );
        m_cardViewButton->setToggleAction( true );
        m_cardViewButton->addTo( listTools );
        listTools->addSeparator();
        // Other Buttons
        QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null,
                                  0, this, 0 );
        actionNew = a;
        connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) );
        a->addTo( edit );
        a->addTo( listTools );
        a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null,
                         0, this, 0 );
        actionEdit = a;
        connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) );
        a->addTo( edit );
        a->addTo( listTools );
        a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
                         0, this, 0 );
        actionTrash = a;
        connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) );
        a->addTo( edit );
        a->addTo( listTools );
        // make it possible to go directly to businesscard via qcop call
        //#if defined(Q_WS_QWS) // Why this ? (se)
 #if !defined(QT_NO_COP)
        QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this );
        connect (addressChannel, SIGNAL( received(const QCString &, const QByteArray &)),
                 this, SLOT ( appMessage(const QCString &, const QByteArray &) ) );
 #endif
        // #endif
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
@@ -1,137 +1,137 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef Addressbook_H
 #define Addressbook_H
 // Remove this for OPIE releae 1.0 !
 // #define __DEBUG_RELEASE
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 #include <qstringlist.h>
 #include <qlineedit.h>
 #include "ofloatbar.h"
 #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;
 class AddressbookWindow: public QMainWindow
 {
        Q_OBJECT
 public:
        enum EntryMode { NewEntry=0, EditEntry };
        static QString appName() { return QString::fromLatin1("addressbook"); }
        AddressbookWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
        ~AddressbookWindow();
 protected:
        void resizeEvent( QResizeEvent * e );
        void editPersonal();
        void editEntry( EntryMode );
        void closeEvent( QCloseEvent *e );
        bool save();
 public slots:
        void flush();
        void reload();
        void appMessage(const QCString &, const QByteArray &);
        void setDocument( const QString & );
 #ifdef __DEBUG_RELEASE
        // void slotSave();
 #endif
 private slots:
        void importvCard();
        void exportvCard();
        void slotListNew();
        /* void slotListView(); */
        void slotListDelete();
        void slotViewBack();
        void slotViewEdit();
        void slotPersonalView();
        void listIsEmpty( bool );
        /*  void slotSettings();  */
        void writeMail();
        void slotBeam();
        void beamDone( Ir * );
        void slotSetCategory( int );
        void slotSetLetter( char );
        void slotUpdateToolbar();
        void slotSetFont(int);
        void slotFindOpen();
        void slotFindClose();
        void slotFind();
        void slotNotFound();
        void slotWrapAround();
        void slotViewSwitched( int );
        void slotListView();
        void slotCardView();
        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;
        // Searching stuff
        OFloatBar* searchBar;
        QLineEdit* searchEdit;
        QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail;
        int viewMargin;
        bool syncing;
        QFont *defaultFont;
        int m_curFontSize;
        bool isLoading;
        AbConfig m_config;
        QAction* m_tableViewButton;
        QAction* m_cardViewButton;
        int active_view;
 };
 #endif
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
@@ -1,160 +1,160 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 ** $Id$
 **
 **********************************************************************/
 #define QTOPIA_INTERNAL_FD
 #include "datebook.h"
 #include "datebookday.h"
 #include "datebooksettings.h"
 #include "datebookweek.h"
 #include "datebookweeklst.h"
 #include "dateentryimpl.h"
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/qpedebug.h>
 #include <qpe/event.h>
 #include <qpe/finddialog.h>
 #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>
 #include <qdialog.h>
 #include <qfile.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qregexp.h>
 #include <qtextcodec.h>
 #include <qtextstream.h>
 #include <qtimer.h>
 #include <qtl.h>
 #include <qwidgetstack.h>
 #include <qwindowsystem_qws.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 DateBook::DateBook( QWidget *parent, const char *, WFlags f )
    : QMainWindow( parent, "datebook", f ),
      aPreset( FALSE ),
      presetTime( -1 ),
      startTime( 8 ), // an acceptable default
      rowStyle( 0 ),
      bJumpToCurTime(FALSE),
      syncing(FALSE),
      inSearch(FALSE),
      alarmCounter(0)
 {
        bool needEvilHack= false; // if we need an Evil Hack
        QTime t;
        t.start();
        db = new DateBookDBHack;
        qDebug("loading db t=%d", t.elapsed() );
        loadSettings();
        setCaption( tr("Calendar") );
        setIcon( Resource::loadPixmap( "datebook_icon" ) );
        setToolBarsMovable( FALSE );
        views = new QWidgetStack( this );
        setCentralWidget( views );
        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 );
        connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
        a->addTo( sub_bar );
        sub_bar->addSeparator();
        a = new QAction( tr( "Today" ), Resource::loadPixmap( "datebook/to_day" ),  QString::null, 0, g, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotToday() ) );
        a->addTo( sub_bar );
        //a->addTo( view );
        sub_bar->addSeparator();
        a = new QAction( tr( "Day" ), Resource::loadPixmap( "day" ), QString::null, 0, g, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( viewDay() ) );
        a->addTo( sub_bar );
 //    a->addTo( view );
        a->setToggleAction( TRUE );
        a->setOn( TRUE );
        dayAction = a;
        a = new QAction( tr( "Week" ), Resource::loadPixmap( "week" ), QString::null, 0, g, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( viewWeek() ) );
        a->addTo( sub_bar );
 //    a->addTo( view );
        a->setToggleAction( TRUE );
        weekAction = a;
        a = new QAction( tr( "WeekLst" ), Resource::loadPixmap( "datebook/weeklst" ), QString::null, 0, g, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( viewWeekLst() ) );
        a->addTo( sub_bar );
 //    a->addTo( view );
        a->setToggleAction( TRUE );
        weekLstAction = a;
        a = new QAction( tr( "Month" ), Resource::loadPixmap( "month" ), QString::null, 0, g, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( viewMonth() ) );
        a->addTo( sub_bar );
 //    a->addTo( view );
        a->setToggleAction( TRUE );
        monthAction = a;
        sub_bar->addSeparator();
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
@@ -1,141 +1,141 @@
 #include <qcopchannel_qws.h>
 #include <qwidgetstack.h>
 #include <qlabel.h>
 #include <qaction.h>
 #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"
 #include "bookmanager.h"
 #include "mainwindow.h"
 using namespace Datebook;
 MainWindow::MainWindow()
    : OPimMainWindow( "Datebook", 0, 0 ), m_descMan( "Descriptions" ),  m_locMan( "Locations" )
 {
    setIcon( Resource::loadPixmap( "datebook_icon" ) );
    initUI();
    initManagers();
    initView();
    initConfig();
    QTimer::singleShot(0, this, SLOT(populate() ) );
    QCopChannel* chan = new QCopChannel( "QPE/System", this );
    connect( chan, SIGNAL( received(const QCString&, const QByteArray& ) ),
             this, SLOT( slotReceive( const QCString&, const QByteArray& ) ) );
    chan  = new QCopChannel( "QPE/Datebook", this );
    connect( chan, SIGNAL( received(const QCString&, const QByteArray& ) ),
             this, SLOT( slotReceive( const QCString&, const QByteArray& ) ) );
 }
 MainWindow::~MainWindow() {
    m_tempMan.save();
    m_locMan.save();
    m_descMan.save();
    manager()->save();
    delete m_manager;
 }
 void MainWindow::doSetDocument( const QString& str ) {
 }
 void MainWindow::flush() {
    manager()->save();
 }
 void MainWindow::reload() {
    manager()->reload();
 }
 int MainWindow::create() {
    return 0;
 }
 bool MainWindow::remove( int uid ) {
    manager()->remove( uid );
    return true;
 }
 void MainWindow::beam( int uid ) {
 }
 void MainWindow::show( int uid ) {
    eventShow()->show( manager()->event( uid ) );
 }
 void MainWindow::add( const OPimRecord& ad) {
    manager()->add( ad );
 }
 void MainWindow::edit() {
    edit ( currentView()->currentItem() );
 }
 void MainWindow::edit( int uid ) {
 }
 /*
 * init tool bars layout and so on
 */
 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 );
    mb->insertItem( tr("View"), m_popView );
    mb->insertItem( tr("Settings" ), m_popSetting );
    m_popTemplate = new QPopupMenu( this );
    m_popTemplate->setCheckable( TRUE );
    connect( m_popTemplate, SIGNAL(activated(int) ),
             this, SLOT(slotNewFromTemplate(int) ) );
    m_popView->insertItem(tr("New from template"), m_popTemplate, -1, 0);
    QAction* a = new QAction( tr("New Event"), Resource::loadPixmap("new"),
                              QString::null, 0, this, 0 );
    a->addTo( m_toolBar );
    a->addTo( m_popView );
    connect(a, SIGNAL( activated() ), this, SLOT( create() ) );
    a = new QAction( tr("Edit Event"), Resource::loadPixmap("edit"),
                     QString::null, 0, this, 0 );
    a->addTo( m_popView );
    connect(a, SIGNAL( activated() ), this, SLOT( edit() ) );
    a = new QAction( tr("Today" ), Resource::loadPixmap( "datebook/to_day"),
                     QString::null, 0, this, 0 );
    a->addTo( m_toolBar );
    connect(a, SIGNAL( activated() ), this, SLOT( slotGoToNow() ) );
    a = new QAction( tr("Find"), Resource::loadPixmap( "mag" ),
                     QString::null, 0, this, 0 );
    a->addTo( m_toolBar );
    connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
    a = new QAction( tr("Configure"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
    connect(a, SIGNAL( activated() ), this, SLOT( slotConfigure() ) );
    a = new QAction( tr("Configure Locations"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
    connect(a, SIGNAL( activated() ), this, SLOT( slotConfigureLocs() ) );
    a = new QAction( tr("Configure Descriptions"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
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
@@ -1,107 +1,107 @@
 #ifndef DATE_BOOK_MAIN_WINDOW_H
 #define DATE_BOOK_MAIN_WINDOW_H
 #include <qlist.h>
 #include <opie/opimmainwindow.h>
 #include "descriptionmanager.h"
 #include "locationmanager.h"
 #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
        friend class Show; // to avoid QObject
        friend class View; // to avoid QObject
        friend class Editor;
    public:
        MainWindow();
        ~MainWindow();
    private slots:
        void initUI(); // init the UI
        void initConfig(); // apply the config
        void initView(); // init the Views..
        void initManagers(); // init the Managers including templates, location and description
        void raiseCurrentView(); // raise the current View
        void slotGoToNow(); // will switch the currentView to the curren date time
        void slotFind(); // find!!!
        void slotConfigure(); // configure the app
        void slotClockChanged(bool); // clock changed
        void slotWeekChanged( bool ); // week changed
        void slotAppMessage( const QCString&, const QByteArray& ); // qApp message QPE/Application/datebook
        void slotReceive( const QCString&, const QByteArray& ); // QPE/System and QPE/Datebook
        void slotAction( QAction* ); // View changed
        void slotConfigureLocs(); // Configure the Locations
        void slotConfigureDesc(); // Configure the Desc
        void slotConfigureTemp();
        void slotNewFromTemplate(int ); // called when someone chooses the template menu
        void setTemplateMenu(); // updates the templateMenu
    protected slots:
        void populate();
        void doSetDocument( const QString& str );
        void flush();
        void reload();
        int create();
        bool remove( int uid );
        void beam( int uid );
        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();
        LocationManager locationManager();
        DescriptionManager descriptionManager();
        void setLocationManager( const LocationManager& );
        void setDescriptionManager( const DescriptionManager& );
        Show* eventShow();
        Editor* editor();
    private: // friend functions for Show
        void hideShow(); // to hide the view
        // off friend Show
        // friend of the view
    private:
        void viewPopup( int );
        void viewAdd( const QDate& date );
        void viewAdd( const QDateTime&, const QDateTime& );
        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;
        LocationManager m_locMan;
        Show* m_show;
        Editor* m_edit;
    };
 }
 #endif
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
@@ -1,165 +1,165 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qhbuttongroup.h>
 #include <qhbox.h>
 #include <qpushbutton.h>
 #include <qintdict.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qsignalmapper.h>
 #include <qtextbrowser.h>
 #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"
 #include "olistviewitem.h"
 #include "resultitem.h"
 #include "adresssearch.h"
 #include "todosearch.h"
 #include "datebooksearch.h"
 #include "applnksearch.h"
 #include "doclnksearch.h"
 #include "mainwindow.h"
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
  QMainWindow( parent, name, f ), _currentItem(0)
 {
  setCaption( tr("OSearch") );
  setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
  QFrame *mainFrame = new QFrame( this, "mainFrame" );
  mainFrame->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
  mainLayout = new QVBoxLayout( mainFrame );
  mainLayout->setSpacing( 0 );
  mainLayout->setMargin( 0 );
  resultsList = new OListView( mainFrame );
  resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
  mainLayout->addWidget( resultsList );
  detailsFrame = new QFrame( mainFrame, "detailsFrame" );
  QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
  richEdit = new QTextView( detailsFrame );
  QWhatsThis::add( richEdit, tr("The details of the current result") );
  richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
  detailsLayout->addWidget( richEdit );
  buttonBox = new QHBox( mainFrame, "Button Box" );
  _buttonCount = 0;
  mainLayout->addWidget( detailsFrame );
  mainLayout->addWidget( buttonBox );
  detailsFrame->hide();
  buttonBox->hide();
  searches.append( new AppLnkSearch( resultsList, tr("Applications") ) );
  searches.append( new DocLnkSearch( resultsList, tr("Documents") ) );
  searches.append( new TodoSearch( resultsList, tr("Todo List") ) );
  searches.append( new DatebookSearch( resultsList, tr("Calendar") ) );
  searches.append( new AdressSearch( resultsList, tr("Contacts") ) );
  setCentralWidget( mainFrame );
  popupTimer = new QTimer();
  searchTimer = new QTimer();
  connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup()));
  connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged()));
  connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
  connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
  signalMapper = new QSignalMapper( this );
  connect(signalMapper, SIGNAL(mapped(int)), SLOT( slotAction(int) ) );
  makeMenu();
   Config cfg( "osearch", Config::User );
   cfg.setGroup( "search_settings" );
   actionCaseSensitiv->setOn( cfg.readBoolEntry( "caseSensitiv", false ) );
   actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
 //   actionWholeWordsOnly->setOn( cfg.readBoolEntry( "whole_words_only", false ) );
 }
 void MainWindow::makeMenu()
 {
-   QPEToolBar *toolBar = new QPEToolBar( this );
+   QToolBar *toolBar = new QToolBar( this );
-   QPEToolBar *searchBar = new QPEToolBar(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 );
   setToolBarsMovable( false );
   toolBar->setHorizontalStretchable( true );
   menuBar->insertItem( tr( "Search" ), searchMenu );
   menuBar->insertItem( tr( "Settings" ), cfgMenu );
   //SETTINGS MENU
   cfgMenu->insertItem( tr( "Search" ), searchOptions );
   QPopupMenu *pop;
   for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
                pop = s->popupMenu();
                if (pop){
                        cfgMenu->insertItem( s->text(0), pop );
                }
  }
  //SEARCH
  SearchAllAction = new QAction( tr("Search all"),QString::null,  0, this, 0 );
  SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
 // QWhatsThis::add( SearchAllAction, tr("Search everything...") );
  connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
  SearchAllAction->addTo( searchMenu );
  searchMenu->insertItem( tr( "Options" ), searchOptions );
  //SEARCH OPTIONS
  //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null,  0, this, 0, true );
  //actionWholeWordsOnly->addTo( searchOptions );
  actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null,  0, this, 0, true );
  actionCaseSensitiv->addTo( searchOptions );
  actionWildcards = new QAction( tr("Use wildcards"),QString::null,  0, this, 0, true );
  actionWildcards->addTo( searchOptions );
  //SEARCH BAR
  addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
  QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
  QWhatsThis::add( searchEdit, tr("Enter your search terms here") );
  searchEdit->setFocus();
  searchBar->setHorizontalStretchable( TRUE );
  searchBar->setStretchableWidget( searchEdit );
  SearchAllAction->addTo( searchBar );
  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
       this, SLOT( setSearch( const QString & ) ) );
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
@@ -1,73 +1,73 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 // (c) 2002-2003 Patrick S. Vogt <tille@handhelds.org>
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 #include <qmainwindow.h>
 #include <qdialog.h>
 #include <qaction.h>
 #include <qlist.h>
 #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;
 class QListViewItem;
 class QPopupMenu;
 class QTimer;
 class QSignalMapper;
 class QButton;
 class SearchGroup;
 class MainWindow : public QMainWindow
 {
    Q_OBJECT
 public:
  MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
  ~MainWindow();
  static QString appName() { return QString::fromLatin1("osearch"); }
 public slots:
  void setCurrent(QListViewItem*);
  void setSearch( const QString& );
  void searchAll();
 protected slots:
  void slotAction(int);
  void showPopup();
  void stopTimer( QListViewItem* );
  void searchStringChanged();
  void optionChanged(int);
 private:
  QHBox *buttonBox;
  QMap<int, QButton*> buttonMap;
  QSignalMapper* signalMapper;
  OListView *resultsList;
  QTextView *richEdit;
  OListViewItem *_currentItem;
  QVBoxLayout *mainLayout;
  QFrame *detailsFrame;
  QTimer *popupTimer;
  QTimer *searchTimer;
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
@@ -167,97 +167,97 @@ void MainWindow::initActions() {
        a->setWhatsThis( QWidget::tr( "Click here to send the current task to another device." ) );
        a->addTo( m_edit );
        a->addTo( m_tool );
    }
 #if 0
    // Options menu
    a = new QAction( QWidget::tr("Find"), Resource::loadIconSet( "mag" ),
                     QString::null, 0, this, 0 );
    connect(a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
    a->addTo( m_options );
    m_findAction = a;
    m_options->insertSeparator();
 #endif
    m_completedAction = new QAction( QString::null, QWidget::tr("Show completed tasks"),
                                     0, this, 0, TRUE );
    m_completedAction->addTo( m_options );
    m_completedAction->setOn( showCompleted() );
    connect(m_completedAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowCompleted(bool) ) );
    a = new QAction( QString::null, QWidget::tr("Show only over-due tasks"),
                     0, this, 0, TRUE );
    a->addTo( m_options );
    a->setOn( showOverDue() );
    connect(a, SIGNAL(toggled(bool)), this, SLOT(slotShowDue(bool) ) );
    m_showDeadLineAction = new QAction( QString::null, QWidget::tr("Show task deadlines"),
                                        0, this, 0, TRUE );
    m_showDeadLineAction->addTo( m_options );
    m_showDeadLineAction->setOn( showDeadline() );
    connect(m_showDeadLineAction, SIGNAL(toggled(bool) ), this, SLOT( slotShowDeadLine( bool ) ) );
    m_showQuickTaskAction = new QAction( QString::null, QWidget::tr("Show quick task bar"),
                                     0, this, 0, TRUE );
    m_showQuickTaskAction->addTo( m_options );
    m_showQuickTaskAction->setOn( showQuickTask() );
    connect(m_showQuickTaskAction, SIGNAL( toggled(bool) ), this, SLOT(slotShowQuickTask(bool) ) );
    m_options->insertSeparator();
    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" );
    config.setGroup( "View" );
    m_completed =  config.readBoolEntry( "ShowComplete", TRUE );
    m_curCat = config.readEntry( "Category",    QString::null );
    m_deadline =  config.readBoolEntry( "ShowDeadLine", TRUE);
    m_overdue = config.readBoolEntry("ShowOverDue", FALSE );
    m_quicktask = config.readBoolEntry("ShowQuickTask", TRUE);
 }
 void MainWindow::initUI() {
    m_stack = new OWidgetStack(this,  "main stack");
    setCentralWidget( m_stack );
    setToolBarsMovable( FALSE );
    QToolBar *menubarholder = new QToolBar( this );
    menubarholder->setHorizontalStretchable( TRUE );
    m_bar = new QMenuBar( menubarholder );
    m_tool = new QToolBar( this );
    /** QPopupMenu */
    m_edit = new QPopupMenu( this );
    m_options = new QPopupMenu( this );
    m_catMenu = new QPopupMenu( this );
    m_template = new QPopupMenu( this );
    m_catMenu->setCheckable( TRUE );
    m_template->setCheckable( TRUE );
    connect(m_catMenu, SIGNAL(activated(int) ),
            this, SLOT(setCategory(int) ) );
    connect(m_template, SIGNAL(activated(int) ),
            this, SLOT(slotNewFromTemplate(int) ) );
 }
 void MainWindow::initViews() {
    TableView* tableView = new TableView( this, m_stack );
    QWhatsThis::add( tableView, QWidget::tr( "This is a listing of all current tasks.\n\nThe list displays the following information:\n1. Completed - A green checkmark indicates task is completed.  Click here to complete a task.\n2. Priority - a graphical representation of task priority.  Double-click here to modify.\n3. Description - description of task.  Click here to select the task.\n4. Deadline - shows when task is due.  This column can be shown or hidden by selecting Options->'Show task deadlines' from the menu above." ) );
    m_stack->addWidget( tableView,  m_counter++ );
    m_views.append( tableView );
    m_curView = tableView;
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
@@ -1,62 +1,62 @@
 #include <qaction.h>
 #include <qlineedit.h>
 #include <qwhatsthis.h>
 #include <qpe/resource.h>
 #include <opie/oclickablelabel.h>
 #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" );
    priority3 = Resource::loadPixmap( "todo/priority3" );
    priority5 = Resource::loadPixmap( "todo/priority5" );
    m_lbl = new OClickableLabel( this );
    m_lbl->setMinimumWidth( 15 );
    m_lbl->setPixmap( priority3 );
    connect(m_lbl, SIGNAL(clicked() ), this, SLOT(slotPrio()) );
    QWhatsThis::add( m_lbl, QWidget::tr( "Click here to set the priority of new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
    m_edit = new QLineEdit( this );
    setStretchableWidget( m_edit );
    QWhatsThis::add( m_edit, QWidget::tr( "Enter description of new task here.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
    /*
     * it's not implemented and won't be implemented for 1.0
     */
 #if 0
    QAction *a = new QAction( QWidget::tr( "More" ), Resource::loadPixmap( "todo/more" ), QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( slotMore() ) );
    a->addTo( this );
    a->setWhatsThis( QWidget::tr( "Click here to enter additional information for new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
 #endif
    QAction *a = new QAction( QWidget::tr( "Enter" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( slotEnter() ) );
    a->addTo( this );
    a->setWhatsThis( QWidget::tr( "Click here to add new task.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
    a = new QAction( QWidget::tr( "Cancel" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( slotCancel() ) );
    a->addTo( this );
    a->setWhatsThis( QWidget::tr( "Click here to reset new task information.\n\nThis area is called the quick task bar.\n\nIt allows you to quickly add a new task to your list.  This area can be shown or hidden by selecting Options->'Show quick task bar' from the menu above." ) );
    m_visible = visible;
    if ( !m_visible ) {
        hide();
    }
    m_menu = 0l;
    reinit();
 }
 QuickEditImpl::~QuickEditImpl() {
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,41 +1,41 @@
 #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();
 private slots:
    void slotEnter();
    void slotPrio();
    void slotMore();
    void slotCancel();
 private:
    void reinit();
    int m_state;
    QLabel* m_lbl;
    QLineEdit* m_edit;
    QLabel* m_enter;
    QLabel* m_more;
    QPopupMenu* m_menu;
    OTodo m_todo;
    bool m_visible;
    QPixmap priority1;
    QPixmap priority3;
    QPixmap priority5;
 };
 #endif
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
@@ -1,121 +1,121 @@
 /*
 � � � � � � � �              This file is part of the OPIE Project
               =.
 � � � � � � �.=l.            Copyright (c)  2002 Dan Williams <drw@handhelds.org>
 � � � � � �.>+-=
 �_;:, � � .> � �:=|.         This file is free software; you can
 .> <`_, � > �. � <=          redistribute it and/or modify it under
 :`=1 )Y*s>-.-- � :           the terms of the GNU General Public
 .="- .-=="i, � � .._         License as published by the Free Software
 �- . � .-<_> � � .<>         Foundation; either version 2 of the License,
 � � �._= =} � � � :          or (at your option) any later version.
 � � .%`+i> � � � _;_.
 � � .i_,=:_. � � �-<s.       This file is distributed in the hope that
 � � �+ �. �-:. � � � =       it will be useful, but WITHOUT ANY WARRANTY;
 � � : .. � �.:, � � . . .    without even the 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 file;
 � -_. . . � )=. �=           see the file COPYING. If not, write to the
 � � -- � � � �:-=`           Free Software Foundation, Inc.,
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "mainwindow.h"
 #include "cbinfo.h"
 #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>
 #include <qwhatsthis.h>
 MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
        : QMainWindow( parent, name, fl || WStyle_ContextHelp )
 {
        setCaption( tr( "Checkbook" ) );
        cbDir = Global::applicationFileName( "checkbook", "" );
        lockIcon = Resource::loadPixmap( "locked" );
        // 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 );
        actionOpen->setWhatsThis( tr( "Select a checkbook and then click here to edit it.\n\nYou also can select Edit from the Checkbook menu, or click and hold on a checkbook name." ) );
        connect( actionOpen, SIGNAL( activated() ), this, SLOT( slotEdit() ) );
        actionOpen->addTo( popup );
        actionOpen->addTo( bar );
        actionDelete = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null,
                                                                0, this, 0 );
        actionDelete->setWhatsThis( tr( "Select a checkbook and then click here delete it.\n\nYou also can select Delete from the Checkbook menu." ) );
        connect( actionDelete, SIGNAL( activated() ), this, SLOT( slotDelete() ) );
        actionDelete->addTo( popup );
        actionDelete->addTo( bar );
        popup->insertSeparator();
        a = new QAction( tr( "Configure" ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
        a->setWhatsThis( tr( "Click here to configure this app." ) );
        connect( a, SIGNAL( activated() ), this, SLOT( slotConfigure() ) );
        a->addTo( popup );
        a->addTo( bar );
        mb->insertItem( tr( "Checkbook" ), popup );
        // Load Checkbook selection list
        checkbooks = new CBInfoList();
        QDir checkdir( cbDir );
        if (checkdir.exists() == true)
        {
                QStringList cblist = checkdir.entryList( "*.qcb", QDir::Files|QDir::Readable|QDir::Writable,
                                                                                                         QDir::Time );
                CBInfo *cb = 0x0;
                QString filename;
                for ( QStringList::Iterator it = cblist.begin(); it != cblist.end(); it++ )
                {
                        filename = cbDir;
                        filename.append( (*it) );
                        cb = new CBInfo( (*it).remove( (*it).find('.'), (*it).length() ), filename );
                        checkbooks->inSort( cb );
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
@@ -1,68 +1,68 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 #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
 public:
  MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
  ~MainWindow();
  static QString appName() { return QString::fromLatin1("confedit"); }
 public slots:
  void setCurrent(QListViewItem*);
  void groupChanged(const QString&);
  void keyChanged(const QString&);
  void valueChanged(const QString&);
  void showPopup();
  void stopTimer( QListViewItem* );
  void saveConfFile();
  void revertConfFile();
  void removeConfFile();
 private:
        ListViewConfDir *settingList;
         EditWidget *editor;
  QVBoxLayout *mainLayout;
  ListViewItemConf *_item;
  ListViewItemConfigEntry *_currentItem;
  ListViewItemConfFile *_fileItem;
  QTimer *popupTimer;
  QPopupMenu *popupMenuFile;
  QPopupMenu *popupMenuEntry;
        QAction *popupActionSave;
        QAction *popupActionRevert;
        QAction *popupActionDelete;
        QAction *popupActionNew;
        //QAction *popupAction;
        //QAction *popupAction;
  void makeMenu();
 };
 #endif
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
@@ -1,114 +1,114 @@
 /****************************************************************************
 **
 ** Created: Sat Jul 20 08:10:53 2002
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 #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>
 #include <qlistbox.h>
 #include <qstringlist.h>
 #include <qmultilineedit.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qfile.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
    : QMainWindow( parent, name, fl ) {
    if ( !name )
  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 );
    fileMenu->insertItem(tr("New Drink"));
    fileMenu->insertItem(tr("Open Drink"));
    fileMenu->insertItem(tr("Find by Drink Name"));
    fileMenu->insertItem(tr("Find by Alcohol"));
    
    QPopupMenu *editMenu;
    editMenu = new QPopupMenu( this);
    menuBar->insertItem( tr("Edit"), editMenu );
    editMenu->insertItem(tr("edit"));
    
    connect( fileMenu, SIGNAL( activated(int) ), this, SLOT( fileMenuActivated(int) ));
    connect( editMenu, SIGNAL( activated(int) ), this, SLOT( editMenuActivated(int) ));
    QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), "New", 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( fileNew() ) );
    a->addTo( ToolBar1 );
    a = new QAction( tr( "Open" ), Resource::loadPixmap( "bartender/bartender_sm" ), "open", 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( openCurrentDrink() ) );
    a->addTo( ToolBar1 );
    a = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), "Find", 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( askSearch() ) );
    a->addTo( ToolBar1 );
    a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ),"Edit", 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( doEdit() ) );
    a->addTo( ToolBar1 );
    QPushButton *t;
    t= new QPushButton( "BAC", ToolBar1, "bacButtin");
    connect( t, SIGNAL( clicked() ), this, SLOT( doBac() ) );
    
    DrinkView = new QListView( this, "DrinkView" );
    DrinkView->addColumn( tr( "Name of Drink" ) );
 //    DrinkView->setRootIsDecorated( TRUE ); 
    DrinkView->header()->hide();
    QPEApplication::setStylusOperation( DrinkView->viewport(),QPEApplication::RightOnHold);
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
@@ -1,63 +1,63 @@
 /****************************************************************************
 ** Created: Sat Jul 20 08:10:31 2002
 **      by:  L.J. Potter <ljp@llornkcor.com>
 **     copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 #ifndef BARTENDER_H
 #define BARTENDER_H
 #include "newdrinks.h"
 #include <qvariant.h>
 #include <qwidget.h>
 #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:
    void fileMenuActivated(int);
    void editMenuActivated(int); 
    void cleanUp();
    void fileNew();
    void showDrink( QListViewItem *);
    void showDrink(int, QListViewItem *, const QPoint&, int);
    void initDrinkDb();
    void doSearchByName();
    void doSearchByDrink();
    void showSearchResult(QStringList &);
    void doBac();
    void openCurrentDrink();
    void askSearch();
 private:
    void clearList();
    void fillList();
 
 };
 #endif // BARTENDER_H
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
@@ -1,73 +1,73 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  Allrights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** 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
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qapplication.h>
 #include <qlineedit.h>
 #include <qtoolbutton.h>
 #include <qspinbox.h>
 #include <qobjectlist.h>
 #ifdef USEQPE
 #include <qpe/global.h>
 #include <qpe/applnk.h>
 #endif
 #include <qfileinfo.h>
 #include <stdlib.h> //getenv
 #include <qprogressbar.h>
 #ifdef USEQPE
 #include <qpe/config.h>
 #endif
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
 #ifdef USEQPE
 #include <qpe/qcopenvelope_qws.h>
 #endif
 #include "QTReader.h"
 #include "GraphicWin.h"
 #include "Bkmks.h"
 #include "cbkmkselector.h"
 #include "infowin.h"
 #include "ToolbarPrefs.h"
 #include "Prefs.h"
 #include "CAnnoEdit.h"
 #include "QFloatBar.h"
 #include "FixedFont.h"
 #include "URLDialog.h"
 //#include <qpe/fontdatabase.h>
 #ifdef USEQPE
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
 #include "fileBrowser.h"
@@ -209,98 +209,98 @@ void QTReaderApp::hidetoolbars()
 QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
    : QMainWindow( parent, name, f ), bFromDocView( FALSE ), m_dontSave(false),
      fileBar(NULL), navBar(NULL), viewBar(NULL), markBar(NULL)
 {
        m_url_clipboard = false;
        m_url_localfile = false;
        m_url_globalfile = false;
                ftime(&m_lastkeytime);
 ////  qDebug("Application directory = %s", (const tchar *)QPEApplication::documentDir());
 ////  qDebug("Application directory = %s", (const tchar *)Global::applicationFileName("uqtreader","bkmks.xml"));
    m_bcloseDisabled = true;
    m_disableesckey = false;
    pBkmklist = NULL;
    pOpenlist = NULL;
 //    doc = 0;
        m_fBkmksChanged = false;
    
  QString lang = getenv( "LANG" );
  QString rot = getenv( "QWS_DISPLAY" );
 /*
  int m_rot = 0;
  if (rot.contains("Rot90"))
  {
      m_rot = 90;
  }
  else if (rot.contains("Rot180"))
  {
      m_rot = 180;
  }
  else if (rot.contains("Rot270"))
  {
      m_rot = 270;
  }
 //  qDebug("Initial Rotation(%d):%s", m_rot, (const char*)rot);
 */
  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 );
+//    QToolBar *bar = new QToolBar( this );
-//    menubar = new QPEToolBar( 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);
                d.cd(APPDIR);
    }
    QFileInfo fi(d, INIFILE);
 //    qDebug("Path:%s", (const char*)fi.absFilePath());
    Config config(fi.absFilePath());
 #endif
    config.setGroup("Toolbar");
    m_tbmovesave = m_tbmove = config.readBoolEntry("Movable", false);
    m_tbpolsave = m_tbpol = (ToolbarPolicy)config.readNumEntry("Policy", 1);
    m_tbposition = (ToolBarDock)config.readNumEntry("Position", 2);
    menubar = new QToolBar("Menus", this, m_tbposition);
 //    fileBar = new QToolBar("File", this);
 //    QToolBar* viewBar = new QToolBar("File", this);
 //    QToolBar* navBar = new QToolBar("File", this);
 //    QToolBar* markBar = new QToolBar("File", this);
 #ifdef USEQPE
    mb = new QMenuBar( menubar );
 #else
    mb = new QMenuBar( menubar );
 #endif
 //#ifdef USEQPE
    QPopupMenu* tmp = new QPopupMenu(mb);
    mb->insertItem( geticon( "AppsIcon" ), tmp );
 //#else
 //    QMenuBar* tmp = mb;
 //#endif
    QPopupMenu *file = new QPopupMenu( mb );
    tmp->insertItem( tr( "File" ), file );
    QPopupMenu *navigation = new QPopupMenu(mb);
    tmp->insertItem( tr( "Navigation" ), navigation );
    QPopupMenu *view = new QPopupMenu( mb );
    tmp->insertItem( tr( "View" ), view );
    QPopupMenu *marks = new QPopupMenu( this );
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
@@ -1,95 +1,95 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef __QTREADERAPP_H
 #define __QTREADERAPP_H
 //#define _SCROLLPIPE
 //#define __ISEARCH
 //#define MAX_ENCODING 6
 #define MAX_ACTIONS 5
 #include "useqpe.h"
 #include <sys/timeb.h>
 #include <qmainwindow.h>
 #include "CExpander.h"
 #include "CEncoding.h"
 #include <qlist.h>
 //#include <qpe/filemanager.h>
 #include <qmap.h>
 #include <qlineedit.h>
 #include <qstack.h>
 #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;
 class QTReader;
 class QImage;
 class Config;
 enum ActionTypes
 {
    cesNone = 0,
    cesOpenFile,
    cesAutoScroll,
    cesActionMark,
    cesActionAnno,
    cesFullScreen,
    cesZoomIn,
    cesZoomOut,
    cesBack,
    cesForward,
    cesHome,
    cesPageUp,
    cesPageDown,
    cesLineUp,
    cesLineDown,
    cesStartDoc,
    cesEndDoc
 };
 /*
 *m_preferences_action, *m_close_action *m_info_action, *m_touch_action,
 *m_find_action, *m_jump_action, *m_setfont_action *m_goto_action,
 *m_delete_action; *m_autogen_action, *m_clear_action, *m_save_action;
 *m_tidy_action, *m_startBlock_action, *m_endBlock_action;
 *m_setenc_action, *m_setmono_action;
 */
 enum ToolbarPolicy
 {
    cesSingle = 0,
    cesMenuTool,
    cesMultiple
 };
 enum regedit_type
 {
@@ -335,97 +335,97 @@ private slots:
    void addnavbar(Config* _config, const QString& key, QAction* a);
    void addmarkbar(Config* _config, const QString& key, QAction* a);
    bool checkbar(Config* _config, const QString& key);
 #ifdef _SCRIPT
    void SaveScript(const char* sname);
 #endif
 /*
    void setstate(unsigned char* _sd, unsigned short _sdlen);
    void getstate(unsigned char*& data, unsigned short& len);
 */
    void fileOpen2();
    void readfilelist();
    void savefilelist();
    void updatefileinfo();
    bool openfrombkmk(Bkmk*);
  QString m_targetapp, m_targetmsg;
    bool listbkmk(CList<Bkmk>*, const QString& _lab = QString::null);
    QString usefilebrowser();
    void do_regedit();
    void colorChanged( const QColor &c );
    void clear();
    void updateCaption();
    void do_autogen(const QString&);
    void do_addbkmk(const QString&);
    bool findNextBookmark(size_t start);
 private:
    QAction* m_scrollButton;
    QAction* m_buttonAction[MAX_ACTIONS];
    CBkmkSelector* bkmkselector;
    ActionTypes m_spaceTarget, m_escapeTarget, m_returnTarget, m_leftTarget, m_rightTarget,
        m_upTarget, m_downTarget;
    bool m_leftScroll, m_rightScroll, m_upScroll, m_downScroll;
    bool m_bcloseDisabled, m_disableesckey;
    size_t searchStart;
 #ifdef __ISEARCH
    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;
    QLineEdit *searchEdit, *regEdit;
    bool searchVisible;
    bool regVisible;
    bool m_fontVisible, m_twoTouch;
    bool bFromDocView;
    static unsigned long m_uid;
    long unsigned get_unique_id() { return m_uid++; }
    /*
      void resizeEvent( QResizeEvent * r)
      {
 //      qDebug("resize:(%u,%u)", r->oldSize().width(), r->oldSize().height());
 //      qDebug("resize:(%u,%u)", r->size().width(), r->size().height());
      //    bgroup->move( width()-bgroup->width(), 0 );
      }
    */
    CList<Bkmk>* pBkmklist;
    CList<Bkmk>* pOpenlist;
    infowin*  m_infoWin;
    GraphicWin* m_graphicwin;
    QProgressBar* pbar;
    bool m_fBkmksChanged;
 //    int m_nRegAction;
    regedit_type m_nRegAction;
    bkmk_action m_nBkmkAction;
    QString m_autogenstr;
    bool m_dontSave;
 };
 //const int cAutoGen = 0;
 //const int cAddBkmk = 1;
 //const int cDelBkmk = 2;
 //const int cGotoBkmk = 3;
 //const int cRmBkmkFile = 4;
 //const int cJump = 5;
 //const int cMonoSpace = 6;
 //const int cOverlap = 7;
 //const int cSetTarget = 8;
 //const int cOpenFile = 9;
 //const int cSetPipeTarget = 10;
 //const int cSetConfigName = 11;
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
@@ -418,134 +418,134 @@ void MainWindow::initMenu()
  submenuSheet=new QPopupMenu;
  sheetRename->addTo(submenuSheet);
  sheetRemove->addTo(submenuSheet);
  menuFormat->insertItem(tr("&Sheet"), submenuSheet);
  submenuFunc=new QPopupMenu;
  menuInsert->insertItem(tr("&Function"), submenuFunc);
  submenuFuncStd=new QPopupMenu;
  funcPlus->addTo(submenuFuncStd);
  funcMinus->addTo(submenuFuncStd);
  funcCross->addTo(submenuFuncStd);
  funcDivide->addTo(submenuFuncStd);
  submenuFunc->insertItem(tr("&Standard"), submenuFuncStd);
  submenuFuncMath=new QPopupMenu;
  addFlyAction(tr("Summation"), tr("&Summation"), "SUM(", submenuFuncMath);
  addFlyAction(tr("Absolute Value"), tr("&Absolute"), "ABS(", submenuFuncMath);
  submenuFuncMath->insertSeparator();
  addFlyAction(tr("Sine"), tr("Si&ne"), "SIN(", submenuFuncMath);
  addFlyAction(tr("Arc Sine"), tr("A&rc Sine"), "ASIN(", submenuFuncMath);
  addFlyAction(tr("Cosine"), tr("&Cosine"), "COS(", submenuFuncMath);
  addFlyAction(tr("ArcCosine"), tr("Arc Cos&ine"), "COS(", submenuFuncMath);
  addFlyAction(tr("Tangent"), tr("&Tangent"), "TAN(", submenuFuncMath);
  addFlyAction(tr("Arc Tangent"), tr("Arc Tan&gent"), "ATAN(", submenuFuncMath);
  addFlyAction(tr("Arc Tangent of Coordinates"), tr("C&oor. Arc Tangent"), "ATAN2(", submenuFuncMath);
  submenuFuncMath->insertSeparator();
  addFlyAction(tr("Exponential"), tr("&Exponential"), "EXP(", submenuFuncMath);
  addFlyAction(tr("Logarithm"), tr("&Logarithm"), "LOG(", submenuFuncMath);
  addFlyAction(tr("Power"), tr("&Power"), "POW(", submenuFuncMath);
  submenuFunc->insertItem(tr("&Mathematical"), submenuFuncMath);
  submenuFuncStat=new QPopupMenu;
  addFlyAction(tr("Average"), tr("&Average"), "AVG(", submenuFuncStat);
  addFlyAction(tr("Maximum"), tr("Ma&ximum"), "MAX(", submenuFuncStat);
  addFlyAction(tr("Minimum"), tr("&Minimum"), "MIN(", submenuFuncStat);
  addFlyAction(tr("Count"), tr("&Count"), "COUNT(", submenuFuncStat);
  submenuFunc->insertItem(tr("&Statistical"), submenuFuncStat);
  menuInsert->insertSeparator();
  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);
  funcParanOpen->addTo(toolbarFunctions);
  funcParanClose->addTo(toolbarFunctions);
  funcComma->addTo(toolbarFunctions);
  toolFunction=new QToolButton(toolbarFunctions);
  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);
  connect(editData, SIGNAL(returnPressed()), this, SLOT(slotEditAccept()));
  editCellSelect->addTo(toolbarEdit);
 }
 void MainWindow::slotHelpAbout()
 {
  QDialog dialogAbout(this, 0, TRUE);
  dialogAbout.resize(width()-40, height()-80);
  dialogAbout.setCaption(tr("About Opie Sheet"));
  QLabel label(tr("Opie Sheet\nSpreadsheet Software for Opie\nQWDC Beta Winner (as Sheet/Qt)\n\nDeveloped by: Serdar Ozler\nRelease 1.0.2\nRelease Date: October 08, 2002\n\nThis product is licensed under GPL. It is freely distributable. If you want to get the latest version and also the source code, please visit the web site.\n\nhttp://qtopia.sitebest.com"), &dialogAbout);
  label.setGeometry(dialogAbout.rect());
  label.setAlignment(Qt::AlignCenter | Qt::WordBreak);
  dialogAbout.exec();
 }
 void MainWindow::initSheet()
 {
  sheet=new Sheet(DEFAULT_NUM_ROWS, DEFAULT_NUM_COLS, this);
  setCentralWidget(sheet);
  connect(sheet, SIGNAL(currentDataChanged(const QString &)), editData, SLOT(setText(const QString &)));
  connect(sheet, SIGNAL(cellClicked(const QString &)), this, SLOT(slotCellClicked(const QString &)));
  connect(sheet, SIGNAL(sheetModified()), this, SLOT(slotDocModified()));
  connect(editCut, SIGNAL(activated()), sheet, SLOT(editCut()));
  connect(editCopy, SIGNAL(activated()), sheet, SLOT(editCopy()));
  connect(editClear, SIGNAL(activated()), sheet, SLOT(editClear()));
 }
 void MainWindow::slotEditAccept()
 {
  sheet->setData(editData->text());
 }
 void MainWindow::slotEditCancel()
 {
  editData->setText(sheet->getData());
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
@@ -1,92 +1,92 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 /*
 * Opie Sheet (formerly Sheet/Qt)
 * by Serdar Ozler <sozler@sitebest.com>
 */
 #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"
 typedef struct typeSheet
 {
  QString name;
  QList<typeCellData> data;
 };
 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,
          *editCut, *editCopy, *editPaste, *editPasteContents, *editClear, *insertCols, *insertRows, *insertSheets, *insertCells,
          *rowHeight, *rowShow, *rowHide, *rowAdjust, *colWidth, *colShow, *colHide, *colAdjust, *sheetRename, *sheetRemove,
          *dataSort, *dataFindReplace, *editCellSelect, *helpGeneral;
  QLineEdit *editData;
  QButton *buttonUp, *buttonDown, *buttonLeft, *buttonRight;
  QComboBox *comboSheets;
  QToolButton *toolFunction;
  QList<typeSheet> listSheets;
  QString helpFile;
  // Other objects
  Sheet *sheet;
  // Variables
  bool documentModified;
  // Private functions
  void initMenu();
  void initActions();
  void initFunctionsToolbar();
  void initEditToolbar();
  void initStandardToolbar();
  void initSheet();
  void addToData(const QString &data);
  int saveCurrentFile(bool ask=TRUE);
  void documentOpen(const DocLnk &lnkDoc);
  void documentSave(DocLnk *lnkDoc);
  void closeEvent(QCloseEvent *e);
  void addFlyAction(const QString &text, const QString &menuText, const QString &tip, QWidget *w);
  typeSheet *createNewSheet();
  typeSheet *findSheet(const QString &name);
  private slots:
    void slotFileNew();
    void slotFileOpen();
    void slotFileSave();
    void slotFileSaveAs();
    void slotHelpAbout();
    void slotEditAccept();
    void slotEditCancel();
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
@@ -1,143 +1,143 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
 /* local includes */
 #include "tableviewer.h"
 #include "ui/tvbrowseview.h"
 #include "ui/tvfilterview.h"
 #include "ui/tvlistview.h"
 #include "ui/tveditview.h"
 #include "ui/tvkeyedit.h"
 #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
    \brief The main window widget of the application
    This is the main widget of the table viewer application.  
    It is the co-ordination point.
 */
 /*!
    Constructs a new TableViewerWindow
 */
 TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f)
    : QMainWindow(parent, name, f)
 {
    setCaption(tr("Table Viewer"));
 /* Build data */
    ds = new DBStore();
    doc.setType("text/x-xml-tableviewer");
    doc.setName("table");
    dirty = FALSE;
    ts.current_column = 0;
    ts.kRep = ds->getKeys();
 /* build menus */
    menu = new QMenuBar(this, 0);
    QPopupMenu *file_menu = new QPopupMenu;
    file_menu->insertItem("New", this, SLOT(newDocument()));
    file_menu->insertItem("Open", this, SLOT(selectDocument()));
    file_menu->insertSeparator();
    file_menu->insertItem("Properties");
    /* later will want to set this up to clean up first via this, SLOT(quit) */
    menu->insertItem("Document", file_menu); 
    QPopupMenu *edit_menu = new QPopupMenu;
    edit_menu->insertItem("Edit Item", this, SLOT(editItemSlot()));
    edit_menu->insertItem("Edit Keys", this, SLOT(editKeysSlot()));
    edit_menu->insertItem("Edit filters", this, SLOT(filterViewSlot()));
    menu->insertItem("Edit", edit_menu);
    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", 
      QString::null, this, 
      SLOT(deleteItemSlot()), navigation, "Delete Item");
    navigation->addSeparator();
    QToolButton *firstItemButton = new QToolButton(
      QIconSet(Resource::loadPixmap("fastback")), "First Item", 
      QString::null, this, 
      SLOT(firstItem()), navigation, "First Item");
    QToolButton *previousItemButton = new QToolButton(
      QIconSet(Resource::loadPixmap("back")), "Previous Item", 
      QString::null, this, 
      SLOT(previousItem()), navigation, "Previous Item");
    QToolButton *nextItemButton = new QToolButton(
      QIconSet(Resource::loadPixmap("forward")), "Next Item", 
      QString::null, this, 
      SLOT(nextItem()), navigation, "Next Item");
    QToolButton *lastItemButton = new QToolButton(
      QIconSet(Resource::loadPixmap("fastforward")), "Last Item", 
      QString::null, this, 
      SLOT(lastItem()), navigation, "Last Item");
    navigation->addSeparator();
    QToolButton *browseButton = new QToolButton(
      QIconSet(Resource::loadPixmap("day")), "View Single Item", 
      QString::null, this, 
      SLOT(browseViewSlot()), navigation, "View Single Item");
    QToolButton *listButton = new QToolButton(
      QIconSet(Resource::loadPixmap("month")), "View Multiple Items", 
      QString::null, this, 
      SLOT(listViewSlot()), navigation, "View Multiple Items");
    setToolBarsMovable(FALSE);
    setToolBarsMovable(FALSE);
    setToolBarsMovable(FALSE);
 /* Build widgets */
    browseView = new TVBrowseView(&ts, this, 0);
    listView = new TVListView(&ts, this, 0);
    filterView = new TVFilterView(&ts, this, 0);
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,54 +1,54 @@
 #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>
 #include <qlineedit.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/global.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <assert.h>
 #include "kvnc.h"
 #include "krfbcanvas.h"
 #include "krfbconnection.h"
 #include "kvncconndlg.h"
 #include "krfbserver.h"
 static int u_id = 1;
 static int get_unique_id()
 {
                return u_id++;
 }
 /* XPM */
 static char * menu_xpm[] = {
 "12 12 5 1",
        " c None",
        ".c #000000",
        "+c #FFFDAD",
        "@c #FFFF00",
        "#c #E5E100",
 "            ",
 "            ",
 "  ......... ",
 "  .+++++++. ",
 "  .+@@@@#.  ",
 "  .+@@@#.   ",
 "  .+@@#.    ",
 "  .+@#.     ",
 "  .+#.      ",
 "  .+.       ",
 "  ..        ",
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
@@ -1,66 +1,66 @@
 #include "backgammon.h"
 #include "aidialog.h"
 #include "filedialog.h"
 #include "playerdialog.h"
 #include "rulesdialog.h"
 #include "themedialog.h"
 #include <qdatetime.h>
 #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)
 {
    if (!name) setName("BackGammon");
    setCaption(tr( "Backgammon") );
    setIcon( Resource::loadPixmap( "backgammon" ) );
    //general counter varaible
    int a=0;
    //the game engine
    move=new MoveEngine();
    //load the default theme
    Config conf("backgammon");
    if(!conf.isValid())
    {
        qDebug("config file does not exist");
        conf.setGroup("general");
        conf.writeEntry("theme","default");
        conf.setGroup("rules");
        conf.writeEntry("move_with_pieces_out",false);
        conf.writeEntry("nice_dice",false);
        conf.setGroup("display");
        conf.writeEntry("small",false);
        conf.writeEntry("warning",true);
        conf.setGroup("ai");
        conf.writeEntry("rescue",6);
        conf.writeEntry("eliminate",4);
        conf.writeEntry("expose",1);
        conf.writeEntry("protect",5);
        conf.writeEntry("safe",3);
        conf.writeEntry("empty",2);
    }
    conf.setGroup("general");
    theme_name=conf.readEntry("theme","default");
    QString theme_file=QPEApplication::qpeDir()+"/backgammon/"+theme_name+".theme";
    //the rules
    conf.setGroup("rules");
    rules.move_with_pieces_out=conf.readBoolEntry("move_with_pieces_out",false);
    rules.generous_dice=conf.readBoolEntry("nice_dice",false);
       
    move->setRules(rules);
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
@@ -1,99 +1,99 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "fifteen.h"
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #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 )
 {
  // 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 );
  QWidget *spacer = new QWidget( toolbar );
  spacer->setBackgroundMode( PaletteButton );
  toolbar->setStretchableWidget( spacer );
  QAction *a = new QAction( tr( "Randomize" ), Resource::loadPixmap( "new" ),
                            QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), table, SLOT( slotRandomize() ) );
  a->addTo( game );
  a->addTo( toolbar );
  a = new QAction( tr( "Solve" ), Resource::loadPixmap( "repeat" ),
                   QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), table, SLOT( slotReset() ) );
  a->addTo( game );
  a->addTo( toolbar );
  menubar->insertItem( tr( "Game" ), game );
 }
 PiecesTable::PiecesTable(QWidget* parent, const char* name )
  : QTableView(parent, name), _menu(0), _randomized(false)
 {
  // setup table view
  setFrameStyle(StyledPanel | Sunken);
  setBackgroundMode(NoBackground);
  setMouseTracking(true);
  setNumRows(4);
  setNumCols(4);
  // init arrays
  initMap();
  readConfig();
  initColors();
  // set font
  QFont f = font();
  f.setPixelSize(18);
  f.setBold( TRUE );
  setFont(f);
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
@@ -1,109 +1,109 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #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"
 #include "goplayutils.h"
 static const enum bVal computer_color = BLACK;
 static int current_handicap = 1;
 static QBrush *goBrush;
 //static QImage *newBlackStone;
 //static QImage *blackStone;
 //static QImage *whiteStone;
 static QPixmap *newBlackStone;
 static QPixmap *blackStone;
 static QPixmap *whiteStone;
 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 );
    connect( a, SIGNAL( activated() ), go, SLOT( newGame() ) );
    a->addTo( file );
    a = new QAction( tr( "Pass" ), Resource::loadPixmap( "pass" ), QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), go, SLOT( pass() ) );
    a->addTo( file );
    a->addTo( toolbar );
    a = new QAction( tr( "Resign" ), Resource::loadPixmap( "reset" ), QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), go, SLOT( resign() ) );
    a->addTo( file );
    a = new QAction( tr( "Two player option" ),  QString::null, 0, this, 0 );
    a->setToggleAction( TRUE );
    connect( a, SIGNAL( toggled(bool) ), go, SLOT( setTwoplayer(bool) ) );
    a->addTo( file );
    mb->insertItem( tr( "Game" ), file );
    QLabel *turnLabel = new QLabel( toolbar );
    turnLabel->setBackgroundMode( PaletteButton );
    connect( go, SIGNAL(showTurn(const QPixmap&)),
             turnLabel, SLOT(setPixmap(const QPixmap&)) );
    QLabel * scoreLabel = new QLabel( toolbar );
    scoreLabel->setBackgroundMode( PaletteButton );
    connect( go, SIGNAL(showScore(const QString&)),
             scoreLabel, SLOT(setText(const QString&)) );
    toolbar->setStretchableWidget( scoreLabel );
    go->readConfig();
 }
 void GoMainWidget::resizeEvent( QResizeEvent * )
 {
    //### this won't work because of the text label...
    /*
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
@@ -169,97 +169,97 @@ bool Peg::hit( const QPoint &p ) const
    if (!normalPegs[pegtype]->valid(ix, iy))
        return FALSE;
    QRgb pixel = normalPegs[pegtype]->pixel(ix, iy);
    return (qAlpha(pixel ) != 0);
 }
 inline bool Peg::placed() const
 {
    return isplaced;
 }
 inline int Peg::pegGo() const
 {
    return peg_go;
 }
 inline int Peg::pegPos() const
 {
    return peg_pos;
 }
 inline void Peg::setPegPos(int p) 
 {
    peg_pos = p;
 }
 inline void Peg::setPlaced(bool p) 
 {
    isplaced = p;
 }
 inline int Peg::type() const 
 {
    return pegtype;
 }
 /* Load the main image, copy from it the pegs, the board, and the answer image 
 * and use these to create the tray, answer and board
 */
 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("");
    score->setMaximumHeight(20);
    score->setUsesTextLabel(TRUE);
    tb->setStretchableWidget(score);
    connect(m, SIGNAL(scoreChanged(int, int)), this, SLOT(setScore(int, int)));
    connect(score, SIGNAL(clicked()), m, SLOT(resetScore()));
    int a, b;
    m->getScore(&a, &b);
    setScore(a,b);
 }
 void MindBreaker::setScore(int turns, int games)
 {
    double average;
    double total_turns = turns;
    double total_games = games;
    if(total_games > 0) 
        average = total_turns / total_games;
    else 
        average = 0.0;
    score->setText(tr("win avg: %1 turns (%2 games)").arg(average).arg(games));
 }
 MindBreakerBoard::MindBreakerBoard( QCanvas &canv, QWidget *parent, 
                                    const char *name, int wFlags )
                     :  QCanvasView(&canv, parent, name, wFlags)
 {
    int i, x, y;
    struct timeval tv;
    current_go = 0;
    gettimeofday(&tv, 0);
    srand(tv.tv_usec);
    canvas()->setAdvancePeriod(500);
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
@@ -1,76 +1,76 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #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>
 #include <qlabel.h>
 #include <stdlib.h>
 #include <time.h>
 static const char *pix_new[]={
 "20 20 3 1",
 "  c None",
 "# c #00FF00",
 ". c #000000",
 "                    ",
 "       ......       ",
 "     ..######..     ",
 "    .##########.    ",
 "   .############.   ",
 "  .##############.  ",
 "  .##############.  ",
 " .################. ",
 " .################. ",
 " .################. ",
 " .################. ",
 " .################. ",
 " .################. ",
 "  .##############.  ",
 "  .##############.  ",
 "   .############.   ",
 "    .##########.    ",
 "     ..######..     ",
 "       ......       ",
 "                    "};
 /* XPM */
 static const char * happy_xpm[] = {
 "20 20 3 1",
        " c None",
        ".c #ffff3f      ",
@@ -198,97 +198,97 @@ void ResultIndicator::center()
    QPoint pp = w->mapToGlobal( QPoint(0,0) ); 
    QSize s = sizeHint()*3;
    pp = QPoint( pp.x() + w->width()/2 - s.width()/2,
                pp.y() + w->height()/ 2 - s.height()/2 );
    setGeometry( QRect(pp, s) );
    
 }
 void ResultIndicator::timerEvent( QTimerEvent *te )
 {
    if ( te->timerId() != timerId )
        return;
    killTimer( timerId );
    if ( twoStage ) {
        center();
        twoStage = FALSE;
        timerId = startTimer( 1000 );
    } else {
        delete this;
    }
 }
 class MineFrame : public QFrame
 {
 public:
    MineFrame( QWidget *parent, const char *name = 0 )
        :QFrame( parent, name ) {}
    void setField( MineField *f ) { field = f; }
 protected:
    void resizeEvent( QResizeEvent *e ) {
        field->setAvailableRect( contentsRect());
        QFrame::resizeEvent(e); 
    }
 private:
    MineField *field;
 };
 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() ) );
    menuBar->insertItem( tr("Game"), gameMenu );
    
    guessLCD = new QLCDNumber( toolBar );
    toolBar->setStretchableWidget( guessLCD );
    QPalette lcdPal( red );
    lcdPal.setColor( QColorGroup::Background, QApplication::palette().active().background() );
    lcdPal.setColor( QColorGroup::Button, QApplication::palette().active().button() );
    
 //    guessLCD->setPalette( lcdPal );
    guessLCD->setSegmentStyle( QLCDNumber::Flat );
    guessLCD->setFrameStyle( QFrame::NoFrame );
    guessLCD->setNumDigits( 2 );
    guessLCD->setBackgroundMode( PaletteButton );
    newGameButton = new QPushButton( toolBar );
    newGameButton->setPixmap( QPixmap( pix_new ) );
    newGameButton->setFocusPolicy(QWidget::NoFocus);
    connect( newGameButton, SIGNAL(clicked()), this, SLOT(newGame()) );
    
    timeLCD = new QLCDNumber( toolBar );
 //    timeLCD->setPalette( lcdPal );
    timeLCD->setSegmentStyle( QLCDNumber::Flat );
    timeLCD->setFrameStyle( QFrame::NoFrame );
    timeLCD->setNumDigits( 5 ); // "mm:ss"
    timeLCD->setBackgroundMode( PaletteButton );
    
    setToolBarsMovable ( FALSE );
    addToolBar( toolBar );
    MineFrame *mainframe = new MineFrame( this );
    mainframe->setFrameShape( QFrame::Box );
    mainframe->setFrameShadow( QFrame::Raised );
    mainframe->setLineWidth(2);
    field = new MineField( mainframe );
    mainframe->setField( field );
    QFont fnt = field->font();
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
@@ -1,96 +1,96 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "interface.h"
 #include "man.h"
 #include <qpe/resource.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qapplication.h>
 #include <qstyle.h>
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
 
 ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) :
    QMainWindow(parent,name,f),
    canvas(232, 258),
    fanfare("level_up"),
    score(0)
 {
    canvas.setAdvancePeriod(80);
    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");
    levelscore = new QLabel(toolbar);
    levelscore->setBackgroundMode( PaletteButton );
    levelscore->setAlignment( AlignRight | AlignVCenter | ExpandTabs );
    toolbar->setStretchableWidget( levelscore );
    showScore(0,0);
    
    setCentralWidget(pb);
    autoDropTimer = new QTimer(this);
    connect (autoDropTimer, SIGNAL(timeout()), this, SLOT(play()) );
  
    pauseTimer = new QTimer(this);
    connect(pauseTimer, SIGNAL(timeout()), this, SLOT(wait()) ); 
    setFocusPolicy(StrongFocus);
    newGame();
 }
 void ParaShoot::resizeEvent(QResizeEvent *)
 {
    QSize s = centralWidget()->size();
    int fw = style().defaultFrameWidth();
    canvas.resize( s.width() - fw - 2, s.height() - fw - 2);
 }
 void ParaShoot::showScore( int score, int level )
 {
    levelscore->setText(tr("     Level: %1       Score: %2   ").arg(score).arg(level) );
 }
 void ParaShoot::newGame()
 {
    clear();
    if (pauseTimer->isActive()) 
        pauseTimer->stop();
    clear();
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
@@ -1,96 +1,96 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "interface.h"
 #include <qpe/resource.h>
 #include <qpe/qpetoolbar.h>
 #include <qtoolbutton.h>
 #include <qstyle.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
 SnakeGame::SnakeGame(QWidget* parent, const char* name, WFlags f) :
    QMainWindow(parent,name,f),
    canvas(232, 258)
 {
    setCaption( tr("Snake") );
    QPixmap bg = Resource::loadPixmap("snake/grass");
    canvas.setBackgroundPixmap(bg);
    canvas.setUpdatePeriod(100);
    snake = 0;
    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);
    showScore(0);
    scorelabel->setBackgroundMode( PaletteButton );
    scorelabel->setAlignment( AlignRight | AlignVCenter | ExpandTabs );
    toolbar->setStretchableWidget( scorelabel );
    setFocusPolicy(StrongFocus);
    setCentralWidget(cv);
    QTimer::singleShot( 16, this, SLOT(welcomescreen()) );
    gamestopped = true;
    waitover = true;
 }
 SnakeGame::~SnakeGame()
 {
   delete snake;
 }
 void SnakeGame::resizeEvent(QResizeEvent *)
 {
    QSize s = centralWidget()->size();
    int fw = style().defaultFrameWidth();
    canvas.resize( s.width() - fw - 2, s.height() - fw - 2);
 }
 void SnakeGame::welcomescreen()
 {
   QCanvasText* title = new QCanvasText(tr("SNAKE!"), &canvas);
   title->setColor(yellow);
   title->setFont( QFont("times", 18, QFont::Bold) );
   int w = title->boundingRect().width();
   title->move(canvas.width()/2 -w/2, canvas.height()/2-110);
   title->show();
   QCanvasPixmapArray* titlearray = new QCanvasPixmapArray(Resource::findPixmap("snake/title"));
   QCanvasSprite* titlepic = new QCanvasSprite(titlearray, &canvas);
   titlepic->move(canvas.width()/2 - 33, canvas.height()/2-85);
   titlepic->show();
   QCanvasText* instr = new QCanvasText(tr("Use the arrow keys to guide the\n"
                                  "snake to eat the mouse. You must not\n"
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
@@ -1,78 +1,78 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "cardgame.h"
 #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>
 extern int highestZ;
 class CanvasCardPile : public QCanvasRectangle
 {
 public:
    CanvasCardPile( CanvasCardGame *ccg, QCanvas *canvas ) : QCanvasRectangle( canvas ), parent( ccg ) { 
        pile = new QPixmap( 0, 0 );
        pileHeight = 0;
        firstCard = NULL;
    }
    void addCard( CanvasCard *card );
    void advance(int stage);
    void animatedMove() { animatedMove(savedX, savedY); }
    void savePos(void) { savedX = (int)x(); savedY = (int)y(); }
    void animatedMove(int x2, int y2, int steps = 7 );
 protected:
    virtual void draw( QPainter& p );
 private:
    CanvasCardGame *parent;
    QPixmap *pile;
    QImage tempImage32;
    CanvasCard *firstCard;
    int pileHeight;
    int destX, destY;
    int savedX, savedY;
    int animSteps;
 };
 void CanvasCardPile::addCard( CanvasCard *card )
 {
    int offsetDown = ( qt_screen->deviceWidth() < 200 ) ? 9 : 13;
    int cardHeight = ( qt_screen->deviceWidth() < 200 ) ? 27 : 36;
    int cardWidth  = ( qt_screen->deviceWidth() < 200 ) ? 20 : 23;
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
@@ -89,97 +89,97 @@ const char* sampleWGR=
        "1 2 3 66 67 194 100 0\n"
        "1 j 8\n"
        "1 q 7\n"
        "1 x 6\n"
        "1 z 6\n"
        "1 w 4\n"
        "1 k 4\n"
        "1 v 3\n"
        "1 f 3\n"
        "2 y 3\n"
        "2 h 2\n"
        "2 b 2\n"
        "2 m 2\n"
        "3 p 2\n"
        "3 g 2\n"
        "3 u 2\n"
        "4 d 2\n"
        "4 c 2\n"
        "5 l 1\n"
        "5 o 1\n"
        "7 t 1\n"
        "7 n 1\n"
        "7 a 1\n"
        "7 r 1\n"
        "8 s 1\n"
        "8 i 1\n"
        "11 e 1\n"
        "0\n";
 WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) :
    QMainWindow(parent, name, fl)
 {
    if ( qApp->desktop()->width() < 240 ) {
        tile_smallw = 10;
        tile_smallh = 10;
        tile_bigw = 16;
        tile_bigh = 16;
        tile_stweak = 0;
        tile_btweak = 0;
    }
    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);
    cpu = 0;
    board = 0;
    bag = 0;
    racks = 0;
    aiheart = new QTimer(this);
    connect(aiheart, SIGNAL(timeout()), this, SLOT(think()));
    readConfig();
 }
 WordGame::~WordGame()
 {
    writeConfig();
 }
 void WordGame::writeConfig()
 {
    Config cfg("WordGame");
    cfg.setGroup("Game");
    cfg.writeEntry("NameList",namelist,';');
    cfg.writeEntry("CurrentPlayer",gameover ? 0 : player+1);
    if ( !gameover ) {
        cfg.writeEntry("Rules",rules);
        bag->writeConfig(cfg);
        board->writeConfig(cfg);
        scoreinfo->writeConfig(cfg);
    }
    for (int p=0; p<nplayers; p++) {
        cfg.setGroup("Player"+QString::number(p+1));
        if ( gameover ) cfg.clearGroup(); else rack(p)->writeConfig(cfg);
    }
 }
 void WordGame::readConfig()
 {
    Config cfg("WordGame");
    cfg.setGroup("Game");
    int currentplayer = cfg.readNumEntry("CurrentPlayer",0);
    QStringList pnames = cfg.readListEntry("NameList",';');
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
@@ -1,293 +1,293 @@
 /***************************************************************************
 *                                                                         *
 *   DrawPad - a drawing program for Opie Environment                      *
 *                                                                         *
 *   (C) 2002 by S. Prud'homme <prudhomme@laposte.net>                     *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "drawpad.h"
 #include "drawpadcanvas.h"
 #include "ellipsetool.h"
 #include "erasetool.h"
 #include "exportdialog.h"
 #include "filledellipsetool.h"
 #include "filledrectangletool.h"
 #include "filltool.h"
 #include "importdialog.h"
 #include "linetool.h"
 #include "newpagedialog.h"
 #include "page.h"
 #include "pageinformationdialog.h"
 #include "pointtool.h"
 #include "rectangletool.h"
 #include "texttool.h"
 #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>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 DrawPad::DrawPad(QWidget* parent, const char* name,  WFlags fl )
    : QMainWindow(parent, name, WStyle_ContextHelp)
 {
    // init members
    m_pDrawPadCanvas = new DrawPadCanvas(this, this);
    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);
    toolsPopupMenu->insertSeparator();
    QAction* importPageAction = new QAction(tr("Import"), tr("Import..."), 0, this);
    connect(importPageAction, SIGNAL(activated()), this, SLOT(importPage()));
    importPageAction->addTo(toolsPopupMenu);
    QAction* exportPageAction = new QAction(tr("Export"), tr("Export..."), 0, this);
    connect(exportPageAction, SIGNAL(activated()), this, SLOT(exportPage()));
    exportPageAction->addTo(toolsPopupMenu);
    toolsPopupMenu->insertSeparator();
    QAction* thumbnailViewAction = new QAction(tr("Thumbnail View"), tr("Thumbnail View..."), 0, this);
    connect(thumbnailViewAction, SIGNAL(activated()), this, SLOT(thumbnailView()));
    thumbnailViewAction->addTo(toolsPopupMenu);
    QAction* pageInformationAction = new QAction(tr("Page Information"), tr("Page Information..."), 0, this);
    connect(pageInformationAction, SIGNAL(activated()), this, SLOT(pageInformation()));
    pageInformationAction->addTo(toolsPopupMenu);
    toolsPopupMenu->insertSeparator();
    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()));
    m_pRedoAction->addTo(navigationToolBar);
    m_pRedoAction->setWhatsThis( tr( "Click here to re-perform the last action." ) );
    m_pFirstPageAction = new QAction(tr("First Page"), Resource::loadIconSet("fastback"), QString::null, 0, this);
    connect(m_pFirstPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goFirstPage()));
    m_pFirstPageAction->addTo(navigationToolBar);
    m_pFirstPageAction->setWhatsThis( tr( "Click here to view the first page." ) );
    m_pPreviousPageAction = new QAction(tr("Previous Page"), Resource::loadIconSet("back"), QString::null, 0, this);
    connect(m_pPreviousPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goPreviousPage()));
    m_pPreviousPageAction->addTo(navigationToolBar);
    m_pPreviousPageAction->setWhatsThis( tr( "Click here to view the previous page." ) );
    m_pNextPageAction = new QAction(tr("Next Page"), Resource::loadIconSet("forward"), QString::null, 0, this);
    connect(m_pNextPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(goNextPage()));
    m_pNextPageAction->addTo(navigationToolBar);
    m_pNextPageAction->setWhatsThis( tr( "Click here to view the next page." ) );
    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);
    m_pPointToolAction = new QAction(tr("Draw Point"), Resource::loadPixmap("drawpad/point"), "", 0, this);
    connect(m_pPointToolAction, SIGNAL(activated()), this, SLOT(setPointTool()));
    m_pPointToolAction->addTo(linePopupMenu);
    m_pLineToolAction = new QAction(tr("Draw Line"), Resource::loadPixmap("drawpad/line"), "", 0, this);
    connect(m_pLineToolAction, SIGNAL(activated()), this, SLOT(setLineTool()));
    m_pLineToolAction->addTo(linePopupMenu);
    m_pLineToolButton->setPopup(linePopupMenu);
    m_pLineToolButton->setPopupDelay(0);
    m_pRectangleToolButton = new QToolButton(drawModeToolBar);
    m_pRectangleToolButton->setToggleButton(true);
    QWhatsThis::add( m_pRectangleToolButton, tr( "Click here to select one of the available tools to draw rectangles." ) );
    QPopupMenu* rectanglePopupMenu = new QPopupMenu(m_pRectangleToolButton);
    m_pRectangleToolAction = new QAction(tr("Draw Rectangle"), Resource::loadPixmap("drawpad/rectangle"), "", 0, this);
    connect(m_pRectangleToolAction, SIGNAL(activated()), this, SLOT(setRectangleTool()));
    m_pRectangleToolAction->addTo(rectanglePopupMenu);
    m_pFilledRectangleToolAction = new QAction(tr("Draw Filled Rectangle"), Resource::loadPixmap("drawpad/filledrectangle"), "", 0, this);
    connect(m_pFilledRectangleToolAction, SIGNAL(activated()), this, SLOT(setFilledRectangleTool()));
    m_pFilledRectangleToolAction->addTo(rectanglePopupMenu);
    m_pRectangleToolButton->setPopup(rectanglePopupMenu);
    m_pRectangleToolButton->setPopupDelay(0);
    m_pEllipseToolButton = new QToolButton(drawModeToolBar);
    m_pEllipseToolButton->setToggleButton(true);
    QWhatsThis::add( m_pEllipseToolButton, tr( "Click here to select one of the available tools to draw ellipses." ) );
    QPopupMenu* ellipsePopupMenu = new QPopupMenu(m_pEllipseToolButton);
    m_pEllipseToolAction = new QAction(tr("Draw Ellipse"), Resource::loadPixmap("drawpad/ellipse"), "", 0, this);
    connect(m_pEllipseToolAction, SIGNAL(activated()), this, SLOT(setEllipseTool()));
    m_pEllipseToolAction->addTo(ellipsePopupMenu);
    m_pFilledEllipseToolAction = new QAction(tr("Draw Filled Ellipse"), Resource::loadPixmap("drawpad/filledellipse"), "", 0, this);
    connect(m_pFilledEllipseToolAction, SIGNAL(activated()), this, SLOT(setFilledEllipseTool()));
    m_pFilledEllipseToolAction->addTo(ellipsePopupMenu);
    m_pEllipseToolButton->setPopup(ellipsePopupMenu);
    m_pEllipseToolButton->setPopupDelay(0);
    m_pTextToolAction = new QAction(tr("Insert Text"), Resource::loadPixmap("drawpad/text"), QString::null, 0, this);
    m_pTextToolAction->setToggleAction(true);
    connect(m_pTextToolAction, SIGNAL(activated()), this, SLOT(setTextTool()));
    m_pTextToolAction->addTo(drawModeToolBar);
    m_pTextToolAction->setWhatsThis( tr( "Click here to select the text drawing tool." ) );
    m_pFillToolAction = new QAction(tr("Fill Region"), Resource::loadPixmap("drawpad/fill"), QString::null, 0, this);
    m_pFillToolAction->setToggleAction(true);
    connect(m_pFillToolAction, SIGNAL(activated()), this, SLOT(setFillTool()));
    m_pFillToolAction->addTo(drawModeToolBar);
    m_pFillToolAction->setWhatsThis( tr( "Click here to select the fill tool." ) );
    m_pEraseToolAction = new QAction(tr("Erase Point"), Resource::loadPixmap("drawpad/erase"), QString::null, 0, this);
    m_pEraseToolAction->setToggleAction(true);
    connect(m_pEraseToolAction, SIGNAL(activated()), this, SLOT(setEraseTool()));
    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." ) );
    m_pPenColorToolButton = new QToolButton(drawParametersToolBar);
    m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor"));
    QWhatsThis::add( m_pPenColorToolButton, tr( "Click here to select the color used when drawing." ) );
    OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, m_pPenColorToolButton);
    connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&)));
    QToolTip::add(m_pPenColorToolButton, tr("Pen Color"));
    m_pPenColorToolButton->setPopup(penColorPopupMenu);
    m_pPenColorToolButton->setPopupDelay(0);
    changePenColor(Qt::black);
    m_pBrushColorToolButton = new QToolButton(drawParametersToolBar);
    m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor"));
    QWhatsThis::add( m_pBrushColorToolButton, tr( "Click here to select the color used when filling in areas." ) );
    OColorPopupMenu* brushColorPopupMenu = new OColorPopupMenu(Qt::white, m_pBrushColorToolButton);
    connect(brushColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&)));
    QToolTip::add(m_pBrushColorToolButton, tr("Fill Color"));
    m_pBrushColorToolButton->setPopup(brushColorPopupMenu);
    m_pBrushColorToolButton->setPopupDelay(0);
    changeBrushColor(Qt::white);
    finishStartup();
 }
 void DrawPad::finishStartup()
 {
    // init pages
    QFile file(Global::applicationFileName("drawpad", "drawpad.xml"));
    if (file.open(IO_ReadOnly)) {
        m_pDrawPadCanvas->load(&file);
        file.close();
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
@@ -1,87 +1,87 @@
 /****************************************************************************
 ** $Id$
 **
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of an example program for Qt.  This example
 ** program may be used, distributed and modified without limitation.
 **
 *****************************************************************************/
 #include "helpwindow.h"
 #include <qlayout.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/resource.h>
 #include <qaction.h>
 #include <qmenubar.h>
 #include <ctype.h>
 HelpWindow::HelpWindow( const QString& home_, const QString& _path, QWidget* parent, const char *name )
    : QMainWindow( parent, name, WDestructiveClose ), pathCombo( 0 ), selectedURL()
 {
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 2);
    layout->setMargin( 2);
    qDebug(_path);
    browser = new QTextBrowser( this );
    QStringList Strlist;
    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 );
    layout->addMultiCellWidget( toolbar, 0, 0, 0, 0);
    layout->addMultiCellWidget( browser, 1, 2, 0, 2);
    
    browser->setFocus();
 }
 void HelpWindow::setBackwardAvailable( bool b)
 {
    menuBar()->setItemEnabled( backwardId, b);
 }
 void HelpWindow::setForwardAvailable( bool b)
 {
    menuBar()->setItemEnabled( forwardId, b);
 }
 void HelpWindow::textChanged()
 {
    if ( browser->documentTitle().isNull() ) {
  setCaption( "QpeRec - Helpviewer - " + browser->context() );
  selectedURL = browser->context();
    }
    else {
  setCaption( "QpeRec - Helpviewer - " + browser->documentTitle() ) ;
  selectedURL = browser->documentTitle();
    }
 //     if ( !selectedURL.isEmpty() && pathCombo ) {
 //   bool exists = FALSE;
 //   int i;
 //   for ( i = 0; i < pathCombo->count(); ++i ) {
 //       if ( pathCombo->text( i ) == selectedURL ) {
 //     exists = TRUE;
 //     break;
 //       }
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
@@ -1,87 +1,87 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 //
 // Full-screen and rotation options contributed by Robert Wittams <robert@wittams.com>
 //
 #include "showimg.h"
 #include "ImageFileSelector.h"
 #include "settingsdialog.h"
 #include <opie/ofiledialog.h>
 #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>
 #include <qpainter.h>
 #include <qkeycode.h>
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qtimer.h>
 #include <qspinbox.h>
 ControlsDialog::ControlsDialog(const QString &caption,QImage image,int *brightness,QWidget *parent)
        : QDialog(parent,0,true)
 {
    setCaption(caption);
    if ( parent )  {
        setPalette(parent->palette());
    }
    b=brightness;
    img=image;
    setMinimumSize(140,80);
    QGridLayout  *gl= new QGridLayout(this,2,2,4,4);
    pixmap =new ImageWidget(this);;
    QPixmap pm;
    pm.convertFromImage(img);
    pixmap->setPixmap(pm);
    pixmap->setMinimumSize(pm.width(),pm.height());
    gl->addMultiCellWidget(pixmap,0,0,0,2,AlignCenter);
    QLabel *l=new QLabel(tr("Brightness")+":",this);
    gl->addWidget(l,1,0,AlignLeft);
    spb=new QSpinBox(-100,100,2,this);
    gl->addWidget(spb,1,1,AlignRight);
    spb->setValue(0);
    connect(spb,SIGNAL(valueChanged(int)),this, SLOT(bValueChanged(int)));
@@ -183,183 +183,183 @@ void ImagePane::setPixmap( const QPixmap &pm )
 }
 void ImagePane::imageClicked()
 {
    emit clicked();
 }
 //===========================================================================
 /*
  Draws the portion of the scaled pixmap that needs to be updated
 */
 void ImageWidget::paintEvent( QPaintEvent *e )
 {
    QPainter painter(this);
    painter.setClipRect(e->rect());
    painter.fillRect(0,0,width(),height(),QColor(0,0,0));
    if ( pixmap.size() != QSize( 0, 0 ) )
    { // is an image loaded?
        painter.drawPixmap((width() - pixmap.width()) / 2, (height() - pixmap.height()) / 2, pixmap);
    }
 }
 void ImageWidget::mouseReleaseEvent(QMouseEvent *)
 {
    emit clicked();
 }
 //===========================================================================
 ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
 : QMainWindow( parent, name, WResizeNoErase ), filename( 0 ),  bFromDocView( FALSE )
 {
    setCaption( tr("Image Viewer") );
    setIcon( Resource::loadPixmap( "ImageViewer" ) );
    Config cfg("Image Viewer");
    cfg.setGroup("Image Viewer");
    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;
    fileMenuFile = new QPopupMenu(this);
    //menuBarmenubarFile->insertItem( tr("File"), fileMenu );
    fileMenuFile->insertItem(tr("Open"),
                            this, SLOT(openFile()), 0);
    viewMenuFile = new QPopupMenu( this );
    //menubarFile->insertItem( tr("View"), viewMenu );
    viewMenuFile->insertItem( tr("Thumbnail View"),
                              this, SLOT(switchThumbView()), 0, SHOW_THUMBNAILS );
    viewMenuFile->setItemChecked ( SHOW_THUMBNAILS, showThumbView );
    optionsMenuFile = new QPopupMenu( this);
    //menubarFile->insertItem( tr("Options"),optionsMenu );
    slideAction = new QAction( tr( "Slide show" ), Resource::loadIconSet( "slideshow" ),
                               QString::null, 0, this, 0 );
    slideAction->setToggleAction( TRUE );
    connect( slideAction, SIGNAL( toggled(bool) ), this, SLOT( slideShow(bool) ) );
    slideAction->addTo( optionsMenuFile);
 //     slideAction->addTo( toolBar );
 //     optionsMenuFile->insertItem( tr("Slideshow") );
    optionsMenuFile->insertSeparator();
    optionsMenuFile->insertItem( tr("Preferences.."), this, SLOT(settings()), 0);
 //    optionsMenuFile->insertItem( tr("Help"), this, SLOT(help()), 0);
    QStrList fmt = QImage::outputFormats();
    fileMenuView = new QPopupMenu( this );
    //menubarView->insertItem( tr("File"),fileMenu );
    fileMenuView->insertItem( tr("Image Info ..."),this, SLOT(displayInfoDialog()),0 );
    fileMenuView->insertSeparator();
    viewMenuView = new QPopupMenu(this );
    viewMenuView->setCheckable ( true );
    //menubarView->insertItem( tr("View"),viewMenu );
    viewMenuView->insertItem(tr("Horizontal flip"), this, SLOT(hFlip()), 0);
    viewMenuView->insertItem(tr("Vertical flip"), this, SLOT(vFlip()), 0);
    stack = new QWidgetStack( this );
    stack->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
    setCentralWidget( stack );
    imagePanel = new ImagePane( stack );
    connect(imagePanel, SIGNAL(clicked()), this, SLOT(normalView()));
    ImageFileSelector::CURRENT_VIEW cv;
    if(showThumbView)
        cv=ImageFileSelector::THUMBNAIL;
    else
        cv=ImageFileSelector::DETAILED;
    qDebug("cv = %d",cv);
    fileSelector = new ImageFileSelector( cv,stack, "fs");
    //switchThumbView();
    //fileSelector = new ImageFileSelector("image/*", stack, "fs");
    //fileSelector->setNewVisible(FALSE);
    //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 );
    a = new QAction( tr( "Rotate 90"), Resource::loadPixmap( "rotate90" ), QString::null, 0, this, 0);
    connect( a, SIGNAL( activated() ), this, SLOT( rot90() ) );
    a->addTo( iconToolBar );
    a->addTo( viewMenuView );
    a = new QAction( tr( "Rotate 180" ), Resource::loadPixmap( "repeat" ), QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( rot180() ) );
    a->addTo( iconToolBar );
    a->addTo( viewMenuView );
    a = new QAction( tr( "Rotate 270"), Resource::loadPixmap( "rotate270" ), QString::null, 0, this, 0);
    connect( a, SIGNAL( activated() ), this, SLOT( rot270() ) );
    //a->addTo( iconToolBar );
    a->addTo( viewMenuView );
    viewMenuView->insertSeparator();
    viewMenuView->insertItem(tr("Brightness ..."), this, SLOT(displayControlsDialog()), 0);
    viewMenuView->insertItem(tr("Black And White"), this, SLOT(blackAndWhite()), 0,BLACKANDWHITE);
    viewMenuView->insertSeparator();
    sss = new QAction( tr( "Scale to Screen"), Resource::loadPixmap( "scale" ), QString::null, 0, this, 0,true);
    connect( sss, SIGNAL( activated() ), this, SLOT( switchSizeToScreen() ) );
    sss->addTo( iconToolBar );
    sss->addTo( viewMenuView );
    sss->setOn(isSized);
    viewMenuView->insertSeparator();
    a = new QAction( tr( "Fullscreen" ), Resource::loadPixmap( "fullscreen" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( fullScreen() ) );
    a->addTo( iconToolBar );
    a->addTo( viewMenuView);
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
@@ -1,85 +1,85 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef SHOWIMG_H
 #define SHOWIMG_H
 #include <qwidget.h>
 #include <qmainwindow.h>
 #include <qimage.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #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;
 class ImageFileSelector;
 class QTimer;
 class ImageWidget : public QWidget
 {
    Q_OBJECT
 public:
    ImageWidget( QWidget *parent=0 )
        : QWidget( parent )   {
        setBackgroundMode(NoBackground);        
    }
    ~ImageWidget() {  }
    void setPixmap( const QPixmap &pm )  {
        pixmap = pm;
        show();
    }
 signals:
    void clicked();
 protected:
    void paintEvent( QPaintEvent * );
    void mouseReleaseEvent(QMouseEvent* event);
 private:
    QPixmap pixmap;
 };
 class InfoDialog:public QDialog
 {
    Q_OBJECT
 public:
    static void displayInfo(const QString &caption, const QStringList text, QWidget *parent); 
 private:
@@ -203,87 +203,87 @@ private:
    void updateImageInfo(QString &filePath);
    void switchToFileSelector();
    void switchToImageView();
    void updateImage();
 private slots:
    void slideShow( bool on );
    void help(); 
    void slideUpdate();
    bool nextImage();
    bool prevImage();
    void settings();
    void switchThumbView();
    void switchSizeToScreen();
    void setDocument(const QString& fileref);
    void doDelayedLoad();
    void openFile( const DocLnk &file );
    void openFile();
    void open();
    void closeFileSelector();
    void hFlip();
    void vFlip();
    void rot180();
    void rot90();
    void rot270();
    void normalView();
    void fullScreen();
    void stopSlideShow();
    void blackAndWhite();
    void displayInfoDialog();
    void displayControlsDialog();
 private:
    QWMatrix matrix;
    bool rotated90;
    enum MENU_ITEMS  {
        SHOW_THUMBNAILS,
        SIZE_TO_SCREEN,
        BLACKANDWHITE
    };
    QString filename;
    QString delayLoad;
    QImage image;           // the loaded image
    QPixmap pm;         // the converted pixmap
    QPixmap pmScaled;       // the scaled pixmap
-    QPEToolBar  *toolBar;
+    QToolBar  *toolBar;
-    QPEToolBar  *iconToolBar;
+    QToolBar  *iconToolBar;
    QMenuBar  *menuBar;
    QMenuBar  *current;
    QPopupMenu  *fileMenuFile;
    QPopupMenu  *viewMenuFile;
    QPopupMenu  *optionsMenuFile;
    QPopupMenu  *fileMenuView;
    QPopupMenu  *viewMenuView;
    QAction     *sss;                // scale to screen size
    QLabel      *lab;
    ImagePane *imagePanel;
    QWidgetStack *stack;
    //FileSelector *fileSelector;
    ImageFileSelector *fileSelector;
    bool isFullScreen;
    bool isSized;                   // true if image is to be resized to fit the window size
    bool bFromDocView;              // a flag to indicate whether or not we were 
                                    // launched from the document view...
    int slideDelay;
    bool slideRepeat;
    bool slideReverse;      // show slideshow in reverse order
    bool rotateOnLoad;      // rotate by 90 degrees on loading
    bool fastLoad;
    QTimer *slideTimer;
    QValueList<DocLnk> imageList;
    QAction *slideAction;
    
    QString imageInfo[LAST];
 };
 #endif // SHOWIMG_H
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
@@ -1,120 +1,120 @@
 /***************************************************************************
   opieftp.cpp
                             -------------------
 ** Created: Sat Mar 9 23:33:09 2002
    copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 //#define DEVELOPERS_VERSION
 #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>
 #include <qcombobox.h>
 #include <qlistview.h>
 #include <qlabel.h>
 #include <qprogressbar.h>
 #include <qspinbox.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <unistd.h>
 #include <stdlib.h>
 QProgressBar *ProgressBar;
 static netbuf *conn=NULL;
 static int log_progress(netbuf *, int xfered, void *)
 {
 //    int fsz = *(int *)arg;
 //    int pct = (xfered * 100) / fsz;
 //      printf("%3d%%\r", pct);
 //      fflush(stdout);
    ProgressBar->setProgress(xfered);
    qApp->processEvents();
    return 1;
 }
 OpieFtp::OpieFtp( QWidget* parent, const char* name, WFlags fl)
        : QMainWindow( parent,  name, fl )
 {
    setCaption( tr( "OpieFtp" ) );
    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 );
    localMenu  = new QPopupMenu( this );
    remoteMenu  = new QPopupMenu( this );
    tabMenu = new QPopupMenu( this );
    layout->addMultiCellWidget( menuBar, 0, 0, 0, 2 );
    menuBar->insertItem( tr( "Connection" ), connectionMenu);
 //      menuBar->insertItem( tr( "Local" ), localMenu);
 //      menuBar->insertItem( tr( "Remote" ), remoteMenu);
    menuBar->insertItem( tr( "View" ), tabMenu);
    tabMenu->insertItem( tr( "Local" ), localMenu);
    tabMenu->insertItem( tr( "Remote" ), remoteMenu);
    connectionMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
    connectionMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
    connectionMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
    localMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
    localMenu->insertSeparator();
    localMenu->insertItem( tr( "Upload" ), this, SLOT( localUpload() ));
    localMenu->insertItem( tr( "Make Directory" ), this, SLOT( localMakDir() ));
    localMenu->insertItem( tr( "Rename" ), this, SLOT( localRename() ));
    localMenu->insertSeparator();
    localMenu->insertItem( tr( "Delete" ), this, SLOT( localDelete() ));
    localMenu->setCheckable(TRUE);
    remoteMenu->insertItem( tr( "Download" ), this, SLOT( remoteDownload() ));
    remoteMenu->insertItem( tr( "Make Directory" ), this, SLOT( remoteMakDir() ));
    remoteMenu->insertItem( tr( "Rename" ), this, SLOT( remoteRename() ));
    remoteMenu->insertSeparator();
    remoteMenu->insertItem( tr( "Delete" ), this, SLOT( remoteDelete() ));
    tabMenu->insertSeparator();
    tabMenu->insertItem( tr( "Switch to Local" ), this, SLOT( switchToLocalTab() ));
    tabMenu->insertItem( tr( "Switch to Remote" ), this, SLOT( switchToRemoteTab() ));
    tabMenu->insertItem( tr( "Switch to Config" ), this, SLOT( switchToConfigTab() ));
    tabMenu->insertSeparator();
 //    tabMenu->insertItem( tr( "About" ), this, SLOT( doAbout() ));
    tabMenu->setCheckable(TRUE);
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
@@ -1,82 +1,82 @@
 /***************************************************************************
   opieftp.h
                             -------------------
 ** Created: Sat Mar 9 23:33:09 2002
    copyright            : (C) 2002 by ljp
    email                : ljp@llornkcor.com
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 #ifndef OPIEFTP_H
 #define OPIEFTP_H
 #include <qvariant.h>
 #include <qdialog.h>
 #include <qmainwindow.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qpoint.h>
 #include <qpixmap.h>
 class QVBoxLayout; 
 class QHBoxLayout; 
 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;
 class QTimer;
 class OpieFtp : public QMainWindow
 {
    Q_OBJECT
 public:
    OpieFtp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
    ~OpieFtp();
    static QString appName() { return QString::fromLatin1("opieftp"); }
    QTabWidget *TabWidget;
    QWidget *tab, *tab_2, *tab_3;
    QListView *Local_View, *Remote_View;
    QListBox *serverListView;
    QComboBox *UsernameComboBox, *ServerComboBox, *currentPathCombo;
    QLineEdit *PasswordEdit, *remotePath;
    QLabel *TextLabel2, *TextLabel1, *TextLabel3, *TextLabel4;;
    QSpinBox* PortSpinBox;
    QPopupMenu *connectionMenu, *localMenu, *remoteMenu, *tabMenu, *aboutMenu;
    QDir currentDir;
    QString currentRemoteDir;
    QString filterStr;
    QListViewItem * item;
    QPushButton *connectServerBtn, *newServerButton;//
    QToolButton  *cdUpButton, *homeButton, *docButton;
    bool b;
    int currentServerConfig;
 protected slots:
    void timerOut();
    void upDir();
    void homeButtonPushed();
    void docButtonPushed();
    void doAbout(); 
    void serverComboEdited(const QString & );
    void UsernameComboBoxEdited(const QString & );
    void PasswordEditEdited(const QString & );
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,49 +1,49 @@
-#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"
 #include "ircsettings.h"
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) {
    setCaption(tr("IRC Client"));
    m_tabWidget = new IRCTabWidget(this);
    QWhatsThis::add(m_tabWidget, tr("Server connections, channels, queries and other things will be placed here"));
    connect(m_tabWidget, SIGNAL(currentChanged(QWidget *)), this, SLOT(selected(QWidget *)));
    setCentralWidget(m_tabWidget);
    setToolBarsMovable(FALSE);
    QMenuBar *menuBar = new QMenuBar(this);
    QPopupMenu *irc = new QPopupMenu(this);
    menuBar->insertItem(tr("IRC"), irc);
    QAction *a = new QAction(tr("New connection"), Resource::loadPixmap("pass"), QString::null, 0, this, 0);
    connect(a, SIGNAL(activated()), this, SLOT(newConnection()));
    a->setWhatsThis(tr("Create a new connection to an IRC server"));
    a->addTo(irc);
    a = new QAction(tr("Settings"), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0);
    a->setWhatsThis(tr("Configure OpieIRC's behavior and appearance"));
    connect(a, SIGNAL(activated()), this, SLOT(settings()));
    a->addTo(irc);
    loadSettings();
 }
 /*IRCTabWidget MainWindow::getTabWidget(){
  return m_tabWidget;
 } */
 void MainWindow::loadSettings() {
    Config config("OpieIRC");
    config.setGroup("OpieIRC");
    IRCTab::m_backgroundColor = config.readEntry("BackgroundColor", "#FFFFFF");
    IRCTab::m_textColor = config.readEntry("TextColor", "#000000");
    IRCTab::m_errorColor = config.readEntry("ErrorColor", "#FF0000");
    IRCTab::m_selfColor = config.readEntry("SelfColor", "#CC0000");
    IRCTab::m_otherColor = config.readEntry("OtherColor", "#0000BB");
    IRCTab::m_serverColor = config.readEntry("ServerColor", "#0000FF");
    IRCTab::m_notificationColor = config.readEntry("NotificationColor", "#AA3300");
    IRCTab::m_maxLines = config.readNumEntry("Lines", 100);
 }
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
@@ -1,75 +1,75 @@
 /*
 Opie-uBrowser.  a very small web browser, using on QTextBrowser for html display/parsing
 Copyright (C) 2002 Thomas Stephens
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 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 "mainview.h"
 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);
        location->setAutoCompletion( true );
        addToolBar(toolbar);
        browser = new QTextBrowser(this, "browser");
        setCentralWidget(browser);
 //make the button take you to the location
        connect(go, SIGNAL(clicked()), this, SLOT(goClicked()) );
        connect(location->lineEdit(), SIGNAL(returnPressed()), this, SLOT(goClicked()) );
 //make back, forward and home do their thing (isnt QTextBrowser great?)
        connect(back, SIGNAL(clicked()), browser, SLOT(backward()) );
        connect(forward, SIGNAL(clicked()), browser, SLOT(forward()) );
        connect(home, SIGNAL(clicked()), browser, SLOT(home()) );
        
 //make back and forward buttons be enabled, only when you can go back or forward (again, i love QTextBrowser)
 //this doesnt seem to work, but doesnt break anything either...
        connect(browser, SIGNAL(backwardAvailable(bool)), back, SLOT(setOn(bool)) );
        connect(browser, SIGNAL(forwardAvailable(bool)), forward, SLOT(setOn(bool)) );
 //notify me when the text of the browser has changed (like when the user clicks a link)
        connect(browser, SIGNAL(textChanged()), this, SLOT(textChanged()) );
        http = new HttpFactory(browser);
        
        if( qApp->argc() > 1 )
        {
                char **argv = qApp->argv();
                int i = 0;
                QString *openfile = new QString( argv[0] );
                while( openfile->contains( "ubrowser" ) == 0 && i < qApp->argc() )
                {
                        i++;
                        *openfile = argv[i];
                }
                *openfile = argv[i+1];
                if( !openfile->startsWith( "http://" ) && !openfile->startsWith( "/" ) )
                {
                        openfile->insert( 0, QDir::currentDirPath()+"/" );
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
@@ -1,53 +1,53 @@
 /*
 Opie-uBrowser.  a very small web browser, using on QTextBrowser for html display/parsing
 Copyright (C) 2002 Thomas Stephens
 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
 License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later
 version.
 This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
 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>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qdir.h>
 #include <stdio.h>
 #include "httpfactory.h"
 class MainView : public QMainWindow
 {
        Q_OBJECT
 public:
        static QString appName() { return QString::fromLatin1("ubrowser"); }
        MainView(QWidget *parent=0, const char *name=0, WFlags fl = 0);
 public slots:
        void goClicked();
        void textChanged();
        void setDocument( const QString& applnk_filename );
 private:
        QToolButton *back;
        QToolButton *forward;
        QToolButton *home;
        QToolButton *go;
        QComboBox *location;
        QTextBrowser *browser;
        HttpFactory *http;
 };
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
@@ -1,85 +1,85 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #include "usermanager.h"
 #include <qlayout.h>
 #include <stdio.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qpe/resource.h>
 #include <qregexp.h>
 /**
 * The mainwindow constructor.
 *
 * @param QWidget *parent
 * @param const char *name
 * @ param WFlags fl
 *
 */
 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");
        editgroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/editgroup"),"Edit Group",0,this,SLOT(editGroup()),toolbar,"Edit Group");
        deletegroupToolButton = new QToolButton(Resource::loadPixmap("usermanager/deletegroup"),"Delete Group",0,this,SLOT(delGroup()),toolbar,"Delete Group");
        QToolButton *groupstext = new QToolButton(0,"Group",0,0,0,toolbar,"Group");
        groupstext->setUsesTextLabel(true);
        addToolBar(toolbar,"myToolBar");
        // Add a tabwidget and all the tabs.
        myTabWidget = new QTabWidget(this,"My Tab Widget");
        setupTabAccounts();
        setupTabAllUsers();
        setupTabAllGroups();
        userPopupMenu.insertItem("Copy",0);
        
        getUsers(); // Fill out the iconview & listview with all users.
        getGroups(); // Fill out the group listview with all groups.
        
        setCentralWidget(myTabWidget);
 }
 UserConfig::~UserConfig() {
        accounts->close();
        delete accounts;
 }
 void UserConfig::setupTabAccounts() {
        QWidget *tabpage = new QWidget(this);
        QVBoxLayout *layout = new QVBoxLayout(tabpage);
        layout->setMargin(5);
        
        usersIconView=new QListView(tabpage,"users");
        usersIconView->addColumn("Icon");
        usersIconView->addColumn("Username");
        usersIconView->setAllColumnsShowFocus(true);
        layout->addWidget(usersIconView);
        
        connect(usersIconView,SIGNAL(returnPressed(QListViewItem *)),this,SLOT(showUserMenu(QListViewItem *)));
        
        myTabWidget->addTab(tabpage,"Users");
 }
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
@@ -1,67 +1,67 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 #ifndef USERCONFIG_H
 #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
        
 public:
        static QString appName() { return QString::fromLatin1("usermanager"); }
        UserConfig( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
        ~UserConfig();
 private:
        QToolButton *adduserToolButton;
        QToolButton *edituserToolButton;
        QToolButton *deleteuserToolButton;
        QToolButton *addgroupToolButton;
        QToolButton *editgroupToolButton;
        QToolButton *deletegroupToolButton;
        QTabWidget *myTabWidget;
        QListView *usersIconView;
        QListView *usersListView;
        QListView *groupsListView;
        QPopupMenu userPopupMenu;
        QPopupMenu groupPopupMenu;
        int availableUID;
        int availableGID;
        void setupTabAccounts();
        void setupTabAllUsers();
        void setupTabAllGroups();
        void setupTabPrefs();
        void setupTabAbout();
        void getUsers();
        void getGroups();
        
 private slots:
        void addUser();
        void editUser();
        void delUser();
        void addGroup();
        void editGroup();
        void delGroup();
        void showUserMenu(QListViewItem *item);
 };
 #endif // USERCONFIG_H
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
@@ -1,61 +1,61 @@
 /****************************************************************************
 ** formatter.cpp
 **
 ** Copyright: Thu Apr 11 11:01:13 2002
 **      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>
 #include <qmultilineedit.h>
 #include <qstring.h>
 #include <qlist.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qfile.h>
 #include <qtstream.h>
 #include <qcombobox.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
 #include <qregexp.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 #include <string.h>
 #include <errno.h>
 #define BLANK ' '
 #define DELIMITER '#'
 /* 
   Blah blah blah blah */
 FormatterApp::FormatterApp( QWidget* parent,  const char* name, WFlags fl, bool modal )
        : QMainWindow( parent, name, fl )
 //    : QDialog( parent, name, modal, fl )
 {
    if ( !name )
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
@@ -1,86 +1,86 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "inlineedit.h"
 #include "filebrowser.h"
 #include "filePermissions.h"
 #include <qpe/resource.h>
 #include <qpe/global.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/config.h>
 #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>
 #include <qprogressbar.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <qpe/qpeapplication.h>
 //
 //  FileItem
 //
 FileItem::FileItem( QListView * parent, const QFileInfo & fi )
    : QListViewItem( parent ),
      fileInfo( fi )
 {
    QDate d = fi.lastModified().date();
    setText( 0, fi.fileName() );
    setText( 1, sizeString( fi.size() ) + " " );
    setText( 2, QString().sprintf("%4d-%02d-%02d",d.year(), d.month(), d.day() ) );
    MimeType mt(fi.filePath());
  if ( fi.isSymLink() )
    setText( 3, "symlink" );
    else if( fi.isDir() )
    setText( 3, "directory" );
    else if( isLib() )
  setText( 3, "library" );
    else
  setText( 3, mt.description() );
    QPixmap pm;
    if( fi.isDir() ){
  if( !QDir( fi.filePath() ).isReadable() )
      pm = Resource::loadPixmap( "lockedfolder" );
  else
      pm = Resource::loadPixmap( "folder" );
    }
    else if( !fi.isReadable() )
  pm = Resource::loadPixmap( "locked" );
@@ -794,127 +794,127 @@ void FileView::setShowSymlinks(bool symlinks)
 void FileView::setShowThumbnails(bool thumbnails)
 {
  showThumbnails=thumbnails;
 }
 void FileView::setMenuKeepsOpen(bool keepOpen)
 {
  menuKeepsOpen=keepOpen; 
 }
 FileBrowser::FileBrowser( QWidget * parent,
              const char * name, WFlags f ) :
    QMainWindow( parent, name, f )
 {
    init( QDir::current().canonicalPath() );
 }
 FileBrowser::FileBrowser( const QString & dir, QWidget * parent,
              const char * name, WFlags f ) :
    QMainWindow( parent, name, f )
 {
    init( dir );
 }
 void FileBrowser::init(const QString & dir)
 {
    setCaption( tr("File Manager") );
    setIcon( Resource::loadPixmap( "filebrowser_icon" ) );
    connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
  Config cfg("Filebrowser");
  cfg.setGroup("View");
  bool showHidden=(cfg.readEntry("Hidden","FALSE") == "TRUE");
  bool showSymlinks=(cfg.readEntry("Symlinks","FALSE") == "TRUE");
  bool showThumbnails=(cfg.readEntry("Thumbnails","FALSE") == "TRUE");
  cfg.setGroup("Menu"); 
  bool menuKeepsOpen=(cfg.readEntry("KeepOpen", "FALSE") == "TRUE");
  
    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 );
    menuBar->insertItem( tr( "Sort" ), sortMenu );
    sortMenu->insertItem( tr( "by Name "), this, SLOT( sortName() ) );
    sortMenu->insertItem( tr( "by Size "), this, SLOT( sortSize() ) );
    sortMenu->insertItem( tr( "by Date "), this, SLOT( sortDate() ) );
    sortMenu->insertItem( tr( "by Type "), this, SLOT( sortType() ) );
    sortMenu->insertSeparator();
    sortMenu->insertItem( tr( "Ascending" ), this, SLOT( updateSorting() ) );
    sortMenu->setItemChecked( sortMenu->idAt( 5 ), TRUE );
    sortMenu->setItemChecked( sortMenu->idAt( 0 ), TRUE );
    viewMenu = new QPopupMenu( this);  
  viewMenu->insertItem( tr( "Hidden"), this, SLOT( updateShowHidden() ) );
  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" ),
           QString::null, 0, this, 0 );
    connect( upAction, SIGNAL( activated() ), fileView, SLOT( parentDir() ) );
    upAction->addTo( toolBar );
    QAction *a = new QAction( tr("New folder"), Resource::loadPixmap( "newfolder" ),
           QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), fileView, SLOT( newFolder() ) );
    a->addTo( toolBar );
    a = new QAction( tr("Cut"), Resource::loadPixmap( "cut" ),
           QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), fileView, SLOT( cut() ) );
    a->addTo( toolBar );
    a = new QAction( tr("Copy"), Resource::loadPixmap( "copy" ),
           QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), fileView, SLOT( copy() ) );
    a->addTo( toolBar );
    pasteAction = new QAction( tr("Paste"), Resource::loadPixmap( "paste" ),
                 QString::null, 0, this, 0 );
    connect( pasteAction, SIGNAL( activated() ), fileView, SLOT( paste() ) );
    pasteAction->addTo( toolBar );
 //    dirLabel = new QLabel(this, "DirLabel");
    connect( fileView, SIGNAL( dirChanged() ), SLOT( updateDirMenu() ) );
    updateDirMenu();
    QCopChannel* pcmciaChannel = new QCopChannel( "QPE/Card", this );
    connect( pcmciaChannel, SIGNAL(received(const QCString &, const QByteArray &)),
   this, SLOT(pcmciaMessage( const QCString &, const QByteArray &)) );
 }
 void FileBrowser::pcmciaMessage( const QCString &msg, const QByteArray &)
 {
    if ( msg == "mtabChanged()" ) {
  // ## Only really needed if current dir is on a card
        fileView->updateDir();
    }
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
@@ -1,72 +1,72 @@
 #include <qmultilineedit.h>
 #include <qpopupmenu.h>
 #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);
        toolbar->setStretchableWidget(spacer);
        sendmail = new QAction(tr("Send the mail"), QIconSet(Resource::loadPixmap("mail/sendmail")), 0, 0, this);
        sendmail->addTo(toolbar);
        sendmail->addTo(mailmenu);
        queuemail = new QAction(tr("Queue the mail"), QIconSet(Resource::loadPixmap("mail/sendall")), 0, 0, this);
        queuemail->addTo(toolbar);
        queuemail->addTo(mailmenu);
        attachfile = new QAction(tr("Attach a file"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
        attachfile->addTo(toolbar);
        attachfile->addTo(mailmenu);
        connect(attachfile, SIGNAL(toggled(bool)), SLOT(slotAttachfileChanged(bool)));
        addressbook = new QAction(tr("Addressbook"), QIconSet(Resource::loadPixmap("mail/addbook")), 0, 0, this);
        addressbook->addTo(toolbar);
        addressbook->addTo(mailmenu);
        QWidget *main = new QWidget(this);
        setCentralWidget(main);
        QGridLayout *layout = new QGridLayout(main);
        fromBox = new QComboBox(main);
        fromBox->insertItem(tr("From"), POPUP_FROM_FROM);
        fromBox->insertItem(tr("Reply"), POPUP_FROM_REPLYTO);
        layout->addWidget(fromBox, 0, 0);
        connect(fromBox, SIGNAL(activated(int)), SLOT(slotFromMenuChanged(int)));
        QHBoxLayout *fromLayout = new QHBoxLayout();
        layout->addLayout(fromLayout, 0, 1);
        from = new QComboBox(main);
        fromLayout->addWidget(from);
        replyto = new QLineEdit(main);
        replyto->hide();
        fromLayout->addWidget(replyto);
@@ -80,97 +80,97 @@ ComposerBase::ComposerBase(QWidget *parent, const char *name, WFlags fl)
        connect(receiversBox, SIGNAL(activated(int)), SLOT(slotReceiverMenuChanged(int)));
        QHBoxLayout *receiverLayout = new QHBoxLayout();
        layout->addLayout(receiverLayout, 1, 1);
        to = new QLineEdit(main);
        receiverLayout->addWidget(to);
        cc = new QLineEdit(main);
        cc->hide();
        receiverLayout->addWidget(cc);
        bcc = new QLineEdit(main);
        bcc->hide();
        receiverLayout->addWidget(bcc);
        subjectBox = new QComboBox(main);
        subjectBox->insertItem(tr("Subj."), POPUP_SUBJ_SUBJECT);
        subjectBox->insertItem(tr("Prio."), POPUP_SUBJ_PRIORITY);
        layout->addWidget(subjectBox, 2, 0);
        connect(subjectBox, SIGNAL(activated(int)), SLOT(slotSubjectMenuChanged(int)));
        QHBoxLayout *subjectLayout = new QHBoxLayout();
        layout->addLayout(subjectLayout, 2, 1);
        subject = new QLineEdit(main);
        subjectLayout->addWidget(subject);
        priority = new QComboBox(main);
        priority->insertItem(tr("Low"), POPUP_PRIO_LOW);
        priority->insertItem(tr("Normal"), POPUP_PRIO_NORMAL);
        priority->insertItem(tr("High"), POPUP_PRIO_HIGH);
        priority->setCurrentItem(POPUP_PRIO_NORMAL);
        priority->hide();
        subjectLayout->addWidget(priority);
        QVBox *view = new QVBox(main);
        layout->addMultiCellWidget(view, 3, 3, 0, 1);
        message = new QMultiLineEdit(view);
        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);
        QLabel *attachSpacer = new QLabel(attachToolbar);
        attachSpacer->setBackgroundMode(QWidget::PaletteButton);
        attachToolbar->setStretchableWidget(attachSpacer);
        attachWindow->addToolBar(attachToolbar, QMainWindow::Left);
        attachView = new ListViewPlus(attachWindow);
        attachView->addColumn(tr("Name"), 80);
        attachView->addColumn(tr("Description"), 110);
        attachView->setAllColumnsShowFocus(true);
        attachWindow->setCentralWidget(attachView);
        attachPopup = new QPopupMenu(attachView);
        attachPopup->insertItem(tr("Rename"), POPUP_ATTACH_RENAME);
        attachPopup->insertItem(tr("Change Description"), POPUP_ATTACH_DESC);
        attachPopup->insertSeparator();
        attachPopup->insertItem(tr("Remove"), POPUP_ATTACH_REMOVE);
        attachView->setPopup(attachPopup);
        status = new MailStatusBar(view);
 }
 void ComposerBase::slotAttachfileChanged(bool toggled)
 {
        if (toggled) {
                if (attachWindow->isHidden()) attachWindow->show();
        } else {
                if (!attachWindow->isHidden()) attachWindow->hide();
        }
 }
 void ComposerBase::slotFromMenuChanged(int id)
 {
        if (POPUP_FROM_FROM == id) {
                if (from->isHidden()) from->show();
                if (!replyto->isHidden()) replyto->hide();
        } else if (POPUP_FROM_REPLYTO == id) {
                if (!from->isHidden()) from->hide();
                if (replyto->isHidden()) replyto->show();
        }
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
@@ -1,61 +1,61 @@
 #ifndef COMPOSERBASE_H
 #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
 {
        Q_OBJECT
 public:
        ComposerBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 protected:
        static const int POPUP_FROM_FROM = 0;
        static const int POPUP_FROM_REPLYTO = 1;
        static const int POPUP_RECV_TO = 0;
        static const int POPUP_RECV_CC = 1;
        static const int POPUP_RECV_BCC = 2;
        static const int POPUP_SUBJ_SUBJECT = 0;
        static const int POPUP_SUBJ_PRIORITY = 1;
        static const int POPUP_PRIO_LOW = 0;
        static const int POPUP_PRIO_NORMAL = 1;
        static const int POPUP_PRIO_HIGH = 2;
        static const int POPUP_ATTACH_RENAME = 0;
        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:
        void slotAttachfileChanged(bool toggled);
        void slotFromMenuChanged(int id);
        void slotReceiverMenuChanged(int id);
        void slotSubjectMenuChanged(int id);
 };
 #endif
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,70 +1,70 @@
 #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);
        QLabel *spacer = new QLabel(toolbar);
        spacer->setBackgroundMode(QWidget::PaletteButton);
        toolbar->setStretchableWidget(spacer);
        compose = new QAction(tr("Compose new mail"), QIconSet(Resource::loadPixmap("mail/newmail")), 0, 0, this);
        compose->addTo(toolbar);
        compose->addTo(mailmenu);
         sendQueue = new QAction(tr("Send queued mails"), QIconSet(Resource::loadPixmap("mail/sendqueue")), 0, 0, this);
        sendQueue->addTo(toolbar);
        sendQueue->addTo(mailmenu);
        folders = new QAction(tr("Show/hide folders"), QIconSet(Resource::loadPixmap("mail/folder")), 0, 0, this, 0, true);
        folders->addTo(toolbar);
        folders->addTo(servermenu);
        connect(folders, SIGNAL(toggled(bool)), SLOT(slotFoldersToggled(bool)));
        findmails = new QAction(tr("Search mails"), QIconSet(Resource::loadPixmap("mail/find")), 0, 0, this); 
        findmails->addTo(toolbar);
        findmails->addTo(mailmenu);
        configure = new QAction(tr("Configuration"), QIconSet(Resource::loadPixmap("mail/configure")), 0, 0, this);
        configure->addTo(servermenu);
        QVBox *view = new QVBox(this);
        setCentralWidget(view);
        folderView = new FolderWidget(view);
        folderView->setMinimumHeight(90);
        folderView->setMaximumHeight(90);
        folderView->hide();
        mailView = new MailTable(view);
        mailView->setMinimumHeight(50);
        status = new MailStatusBar(view);
 }
 void MainWindowBase::slotFoldersToggled(bool toggled)
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,37 +1,37 @@
 #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
 public:
        MainWindowBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 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,69 +1,69 @@
 #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);
        spacer->setBackgroundMode(QWidget::PaletteButton);
        toolbar->setStretchableWidget(spacer);
        reply = new QAction(tr("Reply"), QIconSet(Resource::loadPixmap("mail/reply")), 0, 0, this);
        reply->addTo(toolbar);
         reply->addTo(mailmenu);
        forward = new QAction(tr("Forward"), QIconSet(Resource::loadPixmap("mail/forward")), 0, 0, this);
        forward->addTo(toolbar);
        forward->addTo(mailmenu);
        attachbutton = new QAction(tr("Attachments"), QIconSet(Resource::loadPixmap("mail/attach")), 0, 0, this, 0, true);
        attachbutton->addTo(toolbar);
        attachbutton->addTo(mailmenu);
        connect(attachbutton, SIGNAL(toggled(bool)), SLOT(slotChangeAttachview(bool)));
        deleteMail = new QAction(tr("Delete Mail"), QIconSet(Resource::loadPixmap("mail/delete")), 0, 0, this);
        deleteMail->addTo(toolbar);
        deleteMail->addTo(mailmenu);
        QVBox *view = new QVBox(this);
        setCentralWidget(view);
        attachments = new QListView(view);
        attachments->setMinimumHeight(90);
        attachments->setMaximumHeight(90);
        attachments->setAllColumnsShowFocus(true);
        attachments->addColumn("Mime Type", 100);
        attachments->addColumn("Filename", 100);
        attachments->addColumn("Description", 100);
        attachments->hide();
        browser = new QTextBrowser(view);
        openDiag = new OpenDiag(view);
        openDiag->hide();
 }
 void ViewMailBase::slotChangeAttachview(bool state)
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,36 +1,36 @@
 #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);
 };
 #endif
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
@@ -1,265 +1,265 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 // Copyright (C) 2000 Trolltech AS.
 // adadpted form qpe/qipkg
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 #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>
 #include <qlistview.h>
 #include <qtextview.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qtabwidget.h>
 #include <qcombobox.h>
 #include <qmessagebox.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include "pksettingsbase.h"
 #include "utils.h"
 #include "packagelistitem.h"
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
  QMainWindow( parent, name, f )
 //  packageListServers( QObject(parent), name ),
 //  packageListSearch( parent, name ),
 //  packageListDocLnk( parent, name )
        {
  setCaption( tr("Package Manager") );
  settings = new PackageManagerSettings(this,0,TRUE);
  listViewPackages =  new PackageListView( this,"listViewPackages",settings );
  setCentralWidget( listViewPackages );
  listViewPackages->addList( tr("feeds"), &packageListServers );
  listViewPackages->addList( tr("ipkgfind&killefiz"), &packageListSearch );
  listViewPackages->addList( tr("documents"), &packageListDocLnk );
  ipkg = new PmIpkg( settings, this );
  packageListServers.setSettings( settings );
  packageListSearch.setSettings( settings );
  packageListDocLnk.setSettings( settings );
        pvDebug(9,"packageListServers.update");
  packageListServers.update();
        pvDebug(9,"packageListDocLnk.update");
  packageListDocLnk.update();
        pvDebug(9,"makeMenu");
          makeMenu();
  makeChannel();
  connect( section,    SIGNAL(activated(int)), SLOT(sectionChanged()) );
  connect( subsection, SIGNAL(activated(int)), SLOT(subSectionChanged()) );
  connect( settings->removeLinksButton, SIGNAL( clicked()),
                                         SLOT(removeLinks()) );
  connect( settings->createLinksButton, SIGNAL( clicked()),
                                         SLOT(createLinks()) );
        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 );
  menuBar->insertItem( tr( "Package" ), srvMenu );
  menuBar->insertItem( tr( "View" ), viewMenu );
  menuBar->insertItem( tr( "Settings" ), cfgMenu );
  menuBar->insertItem( tr( "Help" ), helpMenu );
 //  QLabel *spacer;
 //  spacer = new QLabel( "", toolBar );
 //  spacer->setBackgroundColor( toolBar->backgroundColor() );
 //  toolBar->setStretchableWidget( spacer );
                
  runAction = new QAction( tr( "Apply" ),
                           Resource::loadPixmap( "oipkg/install" ),
                           QString::null, 0, this, 0 );
  connect( runAction, SIGNAL( activated() ),
           this, SLOT( runIpkg() ) );
  runAction->addTo( toolBar );
  runAction->addTo( srvMenu );
  srvMenu->insertSeparator();
  updateAction = new QAction( tr( "Update" ),
                              Resource::loadIconSet( "oipkg/update" ),
                              QString::null, 0, this, 0 );
  connect( updateAction, SIGNAL( activated() ),
           this , SLOT( updateList() ) );
  updateAction->addTo( toolBar );
  updateAction->addTo( srvMenu );
  QAction *cfgact;
  cfgact = new QAction( tr( "Setups" ),
                        QString::null, 0, this, 0 );
  connect( cfgact, SIGNAL( activated() ),
           SLOT( showSettingsSetup() ) );
  cfgact->addTo( cfgMenu );
                
  cfgact = new QAction( tr( "Servers" ),
                        QString::null, 0, this, 0 );
  connect( cfgact, SIGNAL( activated() ),
           SLOT( showSettingsSrv() ) );
  cfgact->addTo( cfgMenu );
  cfgact = new QAction( tr( "Destinations" ),
                        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 );
         section->font().setPointSize( 8 );
  label = new QLabel( " / ", sectionBar );
         label->font().setPointSize( 8 );
 //  label->setBackgroundMode( PaletteForeground );
  subsection = new QComboBox( false, sectionBar );
         subsection->font().setPointSize( 8 );
  a = new QAction( tr( "Close Section" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), this, SLOT( sectionClose() ) );
  a->addTo( sectionBar );
  setSections();
  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() ) );
  a = new QAction( tr( "Clear Find" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), findEdit, SLOT( clear() ) );
  a->addTo( findBar );
  a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
  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() ) );
  a = new QAction( tr( "Clear Search" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), searchEdit, SLOT( clear() ) );
  a->addTo( searchBar );
  searchCommit  = new QAction( tr( "Do Search" ), Resource::loadPixmap( "find" ), QString::null, 0, this, 0 );
  connect( searchCommit, SIGNAL( activated() ),  SLOT( remotePackageQuery() ) );
  searchCommit->addTo( searchBar );
  a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
  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)),
                         settings, SLOT(activeDestinationChange(int)) );
 //  space->setBackgroundMode( PaletteForeground );
  CheckBoxLink = new QCheckBox( tr("Link"), destBar);
 //  CheckBoxLink->setBackgroundMode( PaletteForeground );
  CheckBoxLink->setChecked( settings->createLinks() );
  connect( CheckBoxLink, SIGNAL(toggled(bool)),
                                 settings, SLOT(linkEnabled(bool)) );
  destAction = new QAction( tr( "Destinations" ), QString::null, 0, this, 0 );
  connect( destAction, SIGNAL( toggled(bool) ), SLOT( destShow(bool) ) );
  a = new QAction( tr( "Close Destinations" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
  connect( a, SIGNAL( activated() ), SLOT( destClose() ) );
  a->addTo( destBar );
  destBar->setStretchableWidget( CheckBoxLink );
  destAction->setToggleAction( true );
  destAction->addTo( viewMenu );
 //   helpMenu
  helpMenu->insertSeparator();
        a = new QAction( tr( "Package Actions" ), QString::null, 0, this, 0 );
         a->addTo( helpMenu );
  helpMenu->insertSeparator();
        a = new QAction( tr( "Install" ),
                                                Resource::loadPixmap( "oipkg/install" ), QString::null, 0, this, 0 );
         a->addTo( helpMenu );
        a = new QAction( tr( "Remove" ),
                                                Resource::loadPixmap( "oipkg/uninstall" ), QString::null, 0, this, 0 );
         a->addTo( helpMenu );
  helpMenu->insertSeparator();
        a = new QAction( tr( "Package Status" ), QString::null, 0, this, 0 );
         a->addTo( helpMenu );
  helpMenu->insertSeparator();
        a = new QAction( tr( "New version, installed" ),
                                                Resource::loadPixmap( "oipkg/installed" ), QString::null, 0, this, 0 );
         a->addTo( helpMenu );
        a = new QAction( tr( "New version, not installed" ),
                                                Resource::loadPixmap( "oipkg/uninstalled" ), QString::null, 0, this, 0 );
         a->addTo( helpMenu );
        a = new QAction( tr( "Old version, installed" ),
                                                Resource::loadPixmap( "oipkg/installedOld" ), QString::null, 0, this, 0 );
         a->addTo( helpMenu );
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
@@ -1,108 +1,108 @@
 /***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 // Copyright (C) 2000 Trolltech AS.
 // adadpted form qpe/qipkg
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 #include <qmainwindow.h>
 #include <qaction.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 #include "package.h"
 #include "packagelist.h"
 #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
 {
    Q_OBJECT
 public:
  MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
  ~MainWindow();
  QCopChannel *channel;
 protected slots:
  void runIpkg();
  void updateList();
  void displayList();
  void subSectionChanged();
  void sectionChanged();
  void showSettings(int);
  void showSettingsSetup();
  void showSettingsSrv();
  void showSettingsDst();
 public slots:
  void sectionClose();
  void sectionShow(bool);
  void findClose();
  void findShow(bool);
  void searchClose();
  void searchShow(bool);
  void destClose();
  void destShow(bool);
  void filterList();
  void createLinks();
  void removeLinks();
        void receive (const QCString &, const QByteArray &);
        void setDocument (const QString &);
  void remotePackageQuery();
 private:
  void makeMenu();
  void makeChannel();
  void setSections();
  void setSubSections();
  bool updateIcon;
  PmIpkg* ipkg;
  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
@@ -1,73 +1,73 @@
 //========================================================================
 //
 // qpdf.cc
 //
 // Copyright 2001 Robert Griebl
 //
 //========================================================================
 #include "aconf.h"
 #include "GString.h"
 #include "PDFDoc.h"
 #include "TextOutputDev.h"
 #include "QPEOutputDev.h"
 #include <qpe/qpeapplication.h>
 #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>
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include "qpdf.h"
 #ifdef QPDF_QPE_ONLY
 #include <qpe/fileselector.h>
 #else
 #include <opie/ofileselector.h>
 #endif
 int main ( int argc, char **argv ) 
 {
        QPEApplication app ( argc, argv );
        // read config file
        globalParams = new GlobalParams ( "" );
        globalParams-> setErrQuiet ( true );
                QPdfDlg *dlg = new QPdfDlg ( );                         
        app. showMainDocumentWidget ( dlg );
        if (( app. argc ( ) == 3 ) && ( app. argv ( ) [1] == QCString ( "-f" )))
                dlg-> openFile ( app. argv ( ) [2] );
        return app. exec ( );
 }
 QPdfDlg::QPdfDlg ( ) : QMainWindow ( )
 {
        setCaption ( tr( "QPdf" ));
        setIcon ( Resource::loadPixmap ( "qpdf_icon" ));
        
        m_busy = false;
        
        m_doc = 0;
        m_pages = 0;