43 files changed, 76 insertions, 67 deletions

diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp
index 8b2abfa..97b0a9e 100644
--- a/core/apps/embeddedkonsole/commandeditdialog.cpp
+++ b/core/apps/embeddedkonsole/commandeditdialog.cpp
@@ -1,25 +1,25 @@
 //comandeditdialog.cpp
 
 #include "commandeditdialog.h"
 #include "playlistselection.h"
 #include <qstring.h>
 #include <qpe/config.h>
 #include <qpe/qpetoolbar.h>
 #include <qwidget.h>
-#include <qpe/qpemenubar.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") );
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index ec438c3..d855d90 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -20,33 +20,33 @@
 /* -------------------------------------------------------------------------- */
 // 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 <qpushbutton.h>
 #include <qfontdialog.h>
 #include <qglobal.h>
 #include <qpainter.h>
-#include <qpe/qpemenubar.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>
@@ -272,33 +272,33 @@ void Konsole::init(const char* _pgm, QStrList & _args)
   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 );
   menuToolBar->setHorizontalStretchable( TRUE );
 
-  QPEMenuBar *menuBar = new QPEMenuBar( menuToolBar );
+  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;
diff --git a/core/apps/helpbrowser/helpbrowser.cpp b/core/apps/helpbrowser/helpbrowser.cpp
index 531dbff..ed1c165 100644
--- a/core/apps/helpbrowser/helpbrowser.cpp
+++ b/core/apps/helpbrowser/helpbrowser.cpp
@@ -19,33 +19,33 @@
 **********************************************************************/
 
 #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 <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.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>
@@ -71,33 +71,33 @@ 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 );
     toolbar->setHorizontalStretchable( TRUE );
-    QPEMenuBar *menu = new QPEMenuBar( toolbar );
+    QMenuBar *menu = new QMenuBar( toolbar );
 
     toolbar = new QPEToolBar( 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 ) ),
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index b875228..0e3254f 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -13,33 +13,33 @@
 // 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 <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.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>
@@ -173,33 +173,33 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
     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 );
     bar->setHorizontalStretchable( true );
     menu = bar;
 
-    QPEMenuBar *mb = new QPEMenuBar( 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 );
     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" ),
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index 8016d8e..cfcfd41 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -8,33 +8,33 @@
 ** 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 <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.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>
@@ -145,33 +145,33 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
     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 );
     toolbar->setHorizontalStretchable( TRUE );
 
       // Create Menubar
-    QPEMenuBar *menu = new QPEMenuBar( toolbar );
+    QMenuBar *menu = new QMenuBar( toolbar );
     menu->setMargin( 0 );
 
     QPEToolBar *bar = new QPEToolBar( 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 );
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 438c270..406ced6 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -24,33 +24,33 @@
 #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 <qpe/qpemenubar.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>
@@ -80,33 +80,33 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 {
         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 );
         bar->setHorizontalStretchable( TRUE );
 
-        QPEMenuBar *mbList = new QPEMenuBar( bar  );
+        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->setHorizontalStretchable( true );
         addToolBar( listTools );
         moveToolBar( listTools, m_config.getToolBarPos() );
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 07d7164..a040d7c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -23,33 +23,33 @@
 #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 <qpe/qpemenubar.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 <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>
@@ -90,33 +90,33 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
         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 );
 //    bar->setHorizontalStretchable( TRUE );
 
-//    QPEMenuBar *mb = new QPEMenuBar( bar );
+//    QMenuBar *mb = new QMenuBar( bar );
 //    mb->setMargin( 0 );
 
 //    QPopupMenu *view = new QPopupMenu( this );
 //    mb->insertItem( tr( "View" ), view );
 
         QPEToolBar *sub_bar = new QPEToolBar(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();
diff --git a/core/pim/datebook2/mainwindow.cpp b/core/pim/datebook2/mainwindow.cpp
index 68525b3..7d436ae 100644
--- a/core/pim/datebook2/mainwindow.cpp
+++ b/core/pim/datebook2/mainwindow.cpp
@@ -1,27 +1,27 @@
 
 #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 <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.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" )
 {
@@ -80,33 +80,33 @@ void MainWindow::edit() {
 }
 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->setHorizontalStretchable( TRUE );
 
-    QPEMenuBar* mb = new QPEMenuBar( m_toolBar );
+    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 );
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index f768d81..80738df 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -15,33 +15,33 @@
 #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 <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpetoolbar.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"
@@ -102,33 +102,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
   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 );
    QPEToolBar *searchBar = new QPEToolBar(this);
-   QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+   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){
diff --git a/noncore/applets/brightnessapplet/.cvsignore b/noncore/applets/brightnessapplet/.cvsignore
new file mode 100644
index 0000000..51d12e8
--- a/dev/null
+++ b/noncore/applets/brightnessapplet/.cvsignore
@@ -0,0 +1,4 @@
+Makefile*
+advancedconfigbase.cpp
+advancedconfigbase.h
+moc_*
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index bf00102..25f9910 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -53,33 +53,33 @@ MainWindow::MainWindow( QWidget* parent, const char* name, WFlags fl )
 {
         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 );
         bar->setHorizontalStretchable( TRUE );
-        QPEMenuBar *mb = new QPEMenuBar( bar );
+        QMenuBar *mb = new QMenuBar( bar );
         mb->setMargin( 0 );
         QPopupMenu *popup = new QPopupMenu( this );
 
         bar = new QPEToolBar( 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 );
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 58538af..4fe45ba 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -1,36 +1,30 @@
 /***************************************************************************
  *                                                                         *
  *   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 "mainwindow.h"
 
-#include <opie2/omenubar.h>
-#include <opie2/omessagebox.h>
-#include <opie2/oresource.h>
-#include <opie2/oconfig.h>
-#include <opie2/otoolbar.h>
-#include <opie2/oapplication.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qcursor.h>
 
 #include "listviewconfdir.h"
 #include "listviewitemconf.h"
 #include "listviewitemconfigentry.h"
 
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index 5661ad5..3a0d8d1 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -54,33 +54,33 @@
 
 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->setFixedHeight(22);
     layout->addMultiCellWidget( ToolBar1, 0, 0, 0, 4 );
 
-    QPEMenuBar *menuBar = new QPEMenuBar( ToolBar1 );
+    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) ));
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index 087ce00..8c0d138 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -269,33 +269,33 @@ QTReaderApp::QTReaderApp( QWidget *parent, const char *name, WFlags f )
     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 QPEMenuBar( menubar );
+    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 );
diff --git a/noncore/apps/opie-reader/QTReaderApp.h b/noncore/apps/opie-reader/QTReaderApp.h
index 2765d47..86c14b1 100644
--- a/noncore/apps/opie-reader/QTReaderApp.h
+++ b/noncore/apps/opie-reader/QTReaderApp.h
@@ -32,33 +32,33 @@
 #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 QPEMenuBar;

+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,
@@ -370,33 +370,33 @@ private slots:
         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 *menubar, *fileBar, *navBar, *viewBar, *markBar;
 #ifdef USEQPE

-    QPEMenuBar *mb;

+    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());
diff --git a/noncore/apps/opie-sheet/mainwindow.cpp b/noncore/apps/opie-sheet/mainwindow.cpp
index 3915e52..fb2ca79 100644
--- a/noncore/apps/opie-sheet/mainwindow.cpp
+++ b/noncore/apps/opie-sheet/mainwindow.cpp
@@ -348,33 +348,33 @@ void MainWindow::initActions()
   funcDivide=new QAction(tr("Division"), QPixmap(func_divide_xpm), tr("&Division"), 0, this);
   funcDivide->setToolTip("/");
   connect(funcDivide, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcParanOpen=new QAction(tr("Open ParanthesistempCellData->row+row1, tempCellData->col+col1"), QPixmap(func_paran_open_xpm), tr("&Open Paranthesis"), 0, this);
   funcParanOpen->setToolTip("(");
   connect(funcParanOpen, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcParanClose=new QAction(tr("Close Paranthesis"), QPixmap(func_paran_close_xpm), tr("&Close Paranthesis"), 0, this);
   funcParanClose->setToolTip(")");
   connect(funcParanClose, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
   funcComma=new QAction(tr("Comma"), QPixmap(func_comma_xpm), tr("&Comma"), 0, this);
   funcComma->setToolTip(",");
   connect(funcComma, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
 }
 
 void MainWindow::initMenu()
 {
-  menu=new QPEMenuBar(this);
+  menu=new QMenuBar(this);
 
   menuFile=new QPopupMenu;
   fileNew->addTo(menuFile);
   fileOpen->addTo(menuFile);
   fileSave->addTo(menuFile);
   fileSaveAs->addTo(menuFile);
 //  menuFile->insertSeparator();
 //  fileQuit->addTo(menuFile);
   menu->insertItem(tr("&File"), menuFile);
 
   menuEdit=new QPopupMenu;
   editAccept->addTo(menuEdit);
   editCancel->addTo(menuEdit);
   editCellSelect->addTo(menuEdit);
   menuEdit->insertSeparator();
   editCut->addTo(menuEdit);
diff --git a/noncore/apps/opie-sheet/mainwindow.h b/noncore/apps/opie-sheet/mainwindow.h
index 370d82e..4007f88 100644
--- a/noncore/apps/opie-sheet/mainwindow.h
+++ b/noncore/apps/opie-sheet/mainwindow.h
@@ -4,56 +4,56 @@
  *   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 <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpetoolbar.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;
-  QPEMenuBar *menu;
+  QMenuBar *menu;
   QPEToolBar *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;
diff --git a/noncore/apps/qashmoney/budgetdisplay.cpp b/noncore/apps/qashmoney/budgetdisplay.cpp
index afc6a2d..492595a 100755
--- a/noncore/apps/qashmoney/budgetdisplay.cpp
+++ b/noncore/apps/qashmoney/budgetdisplay.cpp
@@ -20,33 +20,33 @@ BudgetDisplay::BudgetDisplay ( QWidget *parent ) : QWidget ( parent )
     font.setWeight ( QFont::Bold );
 
     //set the default date to today
     newDate = QDate::currentDate ();
     year = newDate.year();
     month = newDate.month();
     day = newDate.day();
     datelabel = preferences->getDate ( year, month );
 
     setCaption ( "Budget" );
 
     firstline = new QHBox ( this );
     firstline->setSpacing ( 2 );
     secondline = new QHBox ( this );
     secondline->setSpacing ( 10 );
 
-    menu = new QPEMenuBar ( this );
+    menu = new QMenuBar ( this );
     menu->setFrameStyle ( QFrame::Box | QFrame::Sunken );
     budgetmenu = new QPopupMenu ( this );
     lineitemsmenu = new QPopupMenu ( this );
     datemenu = new QPopupMenu ( this );
     menu->insertItem ( "Budget", budgetmenu );
     menu->insertItem ( "Line Item", lineitemsmenu );
     menu->insertItem ( "Date", datemenu );
     budgetmenu->insertItem ( "New", this, SLOT ( newBudget () ), 0, 1 );
     budgetmenu->insertItem ( "Edit", this, SLOT ( editBudget () ), 0, 2 );
     budgetmenu->insertItem ( "Delete", this, SLOT ( deleteBudget () ), 0, 3 );
     lineitemsmenu->insertItem ( "New", this, SLOT ( newLineItem () ), 0, 1 );
     lineitemsmenu->insertItem ( "Edit", this, SLOT ( editLineItem () ), 0, 2 );
     lineitemsmenu->insertItem ( "Delete", this, SLOT ( deleteLineItem () ), 0, 3 );
     datemenu->insertItem ( "Change", this, SLOT ( showCalendar() ) );
 
     budgetbox = new QComboBox ( firstline );
diff --git a/noncore/apps/qashmoney/budgetdisplay.h b/noncore/apps/qashmoney/budgetdisplay.h
index 3976ce1..a4e806c 100755
--- a/noncore/apps/qashmoney/budgetdisplay.h
+++ b/noncore/apps/qashmoney/budgetdisplay.h
@@ -1,41 +1,41 @@
 #ifndef BUDGETDISPLAY_H
 #define BUDGETDISPLAY_H
 
 #include <qlistview.h>
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qstringlist.h>
 #include <qdatetime.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qhbox.h>
 
 #include "currency.h"
 
 class BudgetDisplay : public QWidget
   {
     Q_OBJECT
 
     public:
       BudgetDisplay ( QWidget *parent );
 
-      QPEMenuBar *menu;
+      QMenuBar *menu;
       QPopupMenu *budgetmenu;
       QPopupMenu *lineitemsmenu;
       QPopupMenu *datemenu;
 
       QHBox *firstline;
       QHBox *secondline;
 
       QLabel *budgeted;
       QLabel *actual;
       QLabel *date;
 
       QLineEdit *budgetname;
       QLineEdit *description;
       Currency *currencybox;
 
       QLineEdit *lineitemname;
diff --git a/noncore/apps/qashmoney/qashmoney.cpp b/noncore/apps/qashmoney/qashmoney.cpp
index 20e8d32..e985f0b 100755
--- a/noncore/apps/qashmoney/qashmoney.cpp
+++ b/noncore/apps/qashmoney/qashmoney.cpp
@@ -10,33 +10,33 @@ Preferences *preferences = new Preferences ();
 Account *account = new Account ();
 Transaction *transaction = new Transaction ();
 Transfer *transfer = new Transfer ();
 Memory *memory = new Memory ();
 
 QashMoney::QashMoney () : QWidget ()
   {
     preferences->addPreferences ();
     preferences->initializeColumnPreferences ();
     preferences->initializeSortingPreferences ();
 
     // set the text in the upper part of the frame
     setCaption ( tr ( "QashMoney" ) );
 
     // Create new menubar for our mainwindow
     // and add menu items
-    mainmenu = new QPEMenuBar ( this );
+    mainmenu = new QMenuBar ( this );
     mainmenu->setFrameStyle ( QFrame::PopupPanel | QFrame::Raised );
     preferencesmenu = new QPopupMenu ( this );
     utilitiesmenu = new QPopupMenu ( this );
     mainmenu->insertItem ( "Preferences", preferencesmenu );
     mainmenu->insertItem ( "Utilities", utilitiesmenu );
     preferencesmenu->insertItem ( "Date", this, SLOT ( displayDatePreferencesDialog () ) );
     preferencesmenu->insertItem ( "Account", this, SLOT ( displayAccountPreferencesDialog () ) );
     preferencesmenu->insertItem ( "Transaction", this, SLOT ( displayTransactionPreferencesDialog () ) );
     utilitiesmenu->insertItem ( "Memory", this, SLOT ( displayMemoryDialog () ) );
 
     // create the main tabwidget for displaying accounts and transactions
     maintabs = new QTabWidget ( this );
     tab = new QWidget ( this );
     tab_2 = new QWidget ( this );
     tab_3 = new QWidget ( this );
     maintabs->addTab ( tab, "Accounts" );
diff --git a/noncore/apps/qashmoney/qashmoney.h b/noncore/apps/qashmoney/qashmoney.h
index ec2c7ec..f2c456c 100755
--- a/noncore/apps/qashmoney/qashmoney.h
+++ b/noncore/apps/qashmoney/qashmoney.h
@@ -1,49 +1,49 @@
 #ifndef QASHMONEY_H
 #define QASHMONEY_H
 
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qlayout.h>
 #include <qtabwidget.h>
 #include <qdatetime.h>
 
 #include "accountdisplay.h"
 #include "transactiondisplay.h"
 #include "budgetdisplay.h"
 #include "account.h"
 #include "preferences.h"
 #include "transaction.h"
 #include "transfer.h"
 #include "memory.h"
 #include "budget.h"
 
 class QashMoney : public QWidget
   {
     Q_OBJECT
 
     public:
       QashMoney ();
       ~QashMoney();
 
       QTabWidget* maintabs;
       QWidget* tab;
       QWidget* tab_2;
       QWidget* tab_3;
 
-      QPEMenuBar *mainmenu;
+      QMenuBar *mainmenu;
       QPopupMenu *preferencesmenu;
       QPopupMenu *utilitiesmenu;
 
     public slots:
       void displayDatePreferencesDialog ();
       void displayTransactionPreferencesDialog ();
       void displayAccountPreferencesDialog ();
       void displayMemoryDialog ();
       void setTransactionTab ();
 
     private slots:
       void changeTabDisplay ();
       void showTransactions ();
       void enableOneTouchViewing ();
       void disableOneTouchViewing ();
       void toggleOneTouchViewing ( bool );
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index fbb5c24..fdf0072 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -53,33 +53,33 @@
 */
 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 QPEMenuBar(this, 0);
+    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);
diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp
index 06523f1..755ed10 100644
--- a/noncore/games/backgammon/backgammon.cpp
+++ b/noncore/games/backgammon/backgammon.cpp
@@ -89,33 +89,33 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl)
       theme.writeEntry("dice1","casino_dice");
       theme.writeEntry("dice2","casino_dice");
       theme.writeEntry("table","casino_table_green");
       theme.writeEntry("odds","casino_odds");
     }
     theme.setGroup("theme");
     board_name=theme.readEntry("board","casino_board_1");
     piecesA_name=theme.readEntry("pieces1","casino_pieces_blue");
     piecesB_name=theme.readEntry("pieces2","casino_pieces_white");
     diceA_name=theme.readEntry("dice1","casino_dice");
     diceB_name=theme.readEntry("dice2","casino_dice");
     table_name=theme.readEntry("table","casino_table_green");
     odds_name=theme.readEntry("odds","casino_odds");
     
 
     //the menu
-    QPEMenuBar* menuBar = new QPEMenuBar(this);
+    QMenuBar* menuBar = new QMenuBar(this);
 
     QPopupMenu* gamemenu= new QPopupMenu(this);
     gamemenu->insertItem(tr( "New" ),this,SLOT(newgame()));
     gamemenu->insertSeparator();
     gamemenu->insertItem(tr( "Load" ),this,SLOT(loadgame()));
     gamemenu->insertItem(tr( "Save" ),this,SLOT(savegame()));
     gamemenu->insertSeparator();
     gamemenu->insertItem(tr( "Delete" ),this,SLOT(deletegame()));
     menuBar->insertItem(tr( "Game" ),gamemenu);
 
     QPopupMenu* thememenu= new QPopupMenu(this);
     thememenu->insertItem(tr( "New" ),this,SLOT(newtheme()));
     thememenu->insertSeparator();
     thememenu->insertItem(tr( "Load"),this,SLOT(loadtheme()));
     thememenu->insertItem(tr( "Save" ),this,SLOT(savetheme()));
     thememenu->insertSeparator();
diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp
index 293cd65..212f7b1 100644
--- a/noncore/games/fifteen/fifteen.cpp
+++ b/noncore/games/fifteen/fifteen.cpp
@@ -39,33 +39,33 @@
 
 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);
   toolbar->setHorizontalStretchable( TRUE );
   addToolBar(toolbar);
 
-  QPEMenuBar *menubar = new QPEMenuBar( 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 );
diff --git a/noncore/games/go/gowidget.cpp b/noncore/games/go/gowidget.cpp
index 1d38c9f..476f7ce1 100644
--- a/noncore/games/go/gowidget.cpp
+++ b/noncore/games/go/gowidget.cpp
@@ -49,33 +49,33 @@ 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->setHorizontalStretchable( TRUE );
     addToolBar(toolbar);
 
-    QPEMenuBar *mb = new QPEMenuBar( 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 );
diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp
index c84fe53..814070b 100644
--- a/noncore/games/minesweep/minesweep.cpp
+++ b/noncore/games/minesweep/minesweep.cpp
@@ -233,33 +233,33 @@ protected:
 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 );
     toolBar->setHorizontalStretchable( TRUE );
 
-    QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+    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 );
diff --git a/noncore/games/solitaire/canvascardgame.h b/noncore/games/solitaire/canvascardgame.h
index d159de6..b93cfbf 100644
--- a/noncore/games/solitaire/canvascardgame.h
+++ b/noncore/games/solitaire/canvascardgame.h
@@ -15,33 +15,33 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef CANVAS_CARD_GAME_H
 #define CANVAS_CARD_GAME_H
 
 #include "cardgame.h"
 #include "canvasshapes.h"
 #include "canvascard.h"
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qmainwindow.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpainter.h>
 
 #include <stdlib.h>
 #include <time.h>
 
 
 class CanvasCardPile;
 
 
 class CanvasCardGame : public QCanvasView, public CardGame
 {
 public:
     CanvasCardGame(QCanvas &c, bool snap, QWidget *parent = 0, int numOfDecks = 1, const char *name = 0, WFlags f = 0) :
             QCanvasView( &c, parent, name, f ),
         CardGame(0,numOfDecks),
         moved(FALSE),
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp
index 317a02d..dec5591 100644
--- a/noncore/games/solitaire/canvascardwindow.cpp
+++ b/noncore/games/solitaire/canvascardwindow.cpp
@@ -44,33 +44,33 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f)
 //  canvas.setBackgroundColor(QColor(0x20, 0xb0, 0x50));
   canvas.setBackgroundColor(QColor(0x08, 0x98, 0x2D));
     } else {
         QPixmap bg;
   bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither );  
         canvas.setBackgroundPixmap(bg);
     }
 
 #if defined( QT_QWS_CASSIOPEIA )
     canvas.setAdvancePeriod(70);
 #else
     canvas.setAdvancePeriod(30);
 #endif
 
 
 #ifdef _PATIENCE_USE_ACCELS_
-    QPEMenuBar* menu = menuBar();
+    QMenuBar* menu = menuBar();
 
     QPopupMenu* file = new QPopupMenu;
     file->insertItem(tr("Patience"), this, SLOT(initPatience()), CTRL+Key_F);
     file->insertItem(tr("Freecell"), this, SLOT(initFreecell()), CTRL+Key_F);
     file->insertItem(tr("Chicane"), this, SLOT(initChicane()), CTRL+Key_F);
     file->insertItem(tr("Harp"), this, SLOT(initHarp()), CTRL+Key_F);
     file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub()), CTRL+Key_F);
     menu->insertItem(tr("&Game"), file);
     
     menu->insertSeparator();
 
     settings = new QPopupMenu;
     settings->insertItem(tr("&Change card backs"), this, SLOT(changeCardBacks()), Key_F2);
     snap_id = settings->insertItem(tr("&Snap to position"), this, SLOT(snapToggle()), Key_F3);
     settings->setCheckable(TRUE);
     menu->insertItem(tr("&Settings"),settings);
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index ac08e15..feae237 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -52,33 +52,33 @@
 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);
-    QPEMenuBar* menuBar = new QPEMenuBar(menuToolBar);
+    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);
diff --git a/noncore/multimedia/showimg/showimg.cpp b/noncore/multimedia/showimg/showimg.cpp
index 56bdecf..b7754f7 100644
--- a/noncore/multimedia/showimg/showimg.cpp
+++ b/noncore/multimedia/showimg/showimg.cpp
@@ -218,33 +218,33 @@ ImageViewer::ImageViewer( QWidget *parent, const char *name, int wFlags )
     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->setHorizontalStretchable( TRUE );
 
-    menuBar = new QPEMenuBar( toolBar );
+    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 );
diff --git a/noncore/multimedia/showimg/showimg.h b/noncore/multimedia/showimg/showimg.h
index abbd976..da4c0b6 100644
--- a/noncore/multimedia/showimg/showimg.h
+++ b/noncore/multimedia/showimg/showimg.h
@@ -22,33 +22,33 @@
 #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 QPEMenuBar;
+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 )
@@ -237,34 +237,34 @@ private slots:
 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;
     QPEToolBar  *iconToolBar;
-    QPEMenuBar  *menuBar;
-    QPEMenuBar  *current;
+    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;
diff --git a/noncore/net/opieftp/opieftp.cpp b/noncore/net/opieftp/opieftp.cpp
index ee7d32f..48629bf 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -55,33 +55,33 @@ static int log_progress(netbuf *, int xfered, void *)
     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()) );
 
-    QPEMenuBar *menuBar = new QPEMenuBar(this);
+    QMenuBar *menuBar = new QMenuBar(this);
 //     QPEToolBar *menuBar = new QPEToolBar(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);
diff --git a/noncore/net/opieftp/opieftp.h b/noncore/net/opieftp/opieftp.h
index 7bd615a..f58778a 100644
--- a/noncore/net/opieftp/opieftp.h
+++ b/noncore/net/opieftp/opieftp.h
@@ -19,33 +19,33 @@
 #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 QPEMenuBar;
+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();
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 8f76cdd..95fbdcd 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -3,33 +3,33 @@
 #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);
-    QPEMenuBar *menuBar = new QPEMenuBar(this);
+    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;
 } */
diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index a1d5bee..0336417 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -1,4 +1,15 @@
-- save configuration settings
 - beep over headphone / customizable
-- autoshow new nets - maybe in other color or more contrast
 
+- identification of probe requests
+  i.e. other sniffers around
+
+- decloaking of falsely reported zero-length SSIDs
+
+- option to run skript on
+  - new net
+  - new station
+  - <whatever>
+
+- adaptive hopping scheme !
+
+- 
diff --git a/noncore/unsupported/filebrowser/filebrowser.cpp b/noncore/unsupported/filebrowser/filebrowser.cpp
index d16e771..114ebfa 100644
--- a/noncore/unsupported/filebrowser/filebrowser.cpp
+++ b/noncore/unsupported/filebrowser/filebrowser.cpp
@@ -24,33 +24,33 @@
 #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 <qpopupmenu.h>
-#include <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qaction.h>
 #include <qstringlist.h>
 #include <qcursor.h>
 #include <qmultilineedit.h>
 #include <qfont.h>
 #include <qpainter.h>
 #include <qprogressbar.h>
 
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <qpe/qpeapplication.h>
 
 //
 //  FileItem
 //
@@ -829,33 +829,33 @@ void FileBrowser::init(const QString & dir)
   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 );
     toolBar->setHorizontalStretchable( TRUE );
 
-    QPEMenuBar* menuBar = new QPEMenuBar( toolBar );
+    QMenuBar* menuBar = new QMenuBar( toolBar );
 
     dirMenu = new QPopupMenu( this );
     menuBar->insertItem( tr( "Dir" ), dirMenu );
 
     sortMenu = new QPopupMenu( this );
     menuBar->insertItem( tr( "Sort" ), sortMenu );
     sortMenu->insertItem( tr( "by Name "), this, SLOT( sortName() ) );
     sortMenu->insertItem( tr( "by Size "), this, SLOT( sortSize() ) );
     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 );
 
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 6f6ab8e..34d6eb6 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -9,33 +9,33 @@
 
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.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);
-        menubar = new QPEMenuBar( toolbar );
+        menubar = new QMenuBar( toolbar );
         mailmenu = new QPopupMenu( menubar );
         menubar->insertItem( tr( "Mail" ), mailmenu );
         addToolBar(toolbar);
         toolbar->setHorizontalStretchable(true);
 
         QLabel *spacer = new QLabel(toolbar);
         spacer->setBackgroundMode(QWidget::PaletteButton);
         toolbar->setStretchableWidget(spacer);
 
         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);
diff --git a/noncore/unsupported/mail2/composerbase.h b/noncore/unsupported/mail2/composerbase.h
index 58f1157..2c832d6 100644
--- a/noncore/unsupported/mail2/composerbase.h
+++ b/noncore/unsupported/mail2/composerbase.h
@@ -1,27 +1,27 @@
 #ifndef COMPOSERBASE_H
 #define COMPOSERBASE_H
 
 #include <qmainwindow.h>
 
 class QMultiLineEdit;
 class MailStatusBar;
 class ListViewPlus;
 class QPopupMenu;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 class QComboBox;
 class QLineEdit;
 class QAction;
 class QLabel;
 
 class ComposerBase : public QMainWindow
 {
         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;
@@ -30,32 +30,32 @@ protected:
         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;
-         QPEMenuBar *menubar;
+         QMenuBar *menubar;
         QPopupMenu *mailmenu;
         QComboBox *fromBox, *from, *receiversBox, *subjectBox, *priority;
         QLineEdit *replyto, *to, *cc, *bcc, *subject;
         QAction *sendmail, *queuemail, *attachfile, *addressbook, *abort, *addattach, *delattach;
         QLabel *fromLabel;
 
 protected slots:
         void slotAttachfileChanged(bool toggled);
         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 e35d489..119acfb 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -7,33 +7,33 @@
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.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);
-        menubar = new QPEMenuBar( toolbar );
+        menubar = new QMenuBar( toolbar );
         mailmenu = new QPopupMenu( menubar );
         servermenu = new QPopupMenu( menubar );
         menubar->insertItem( tr( "Mail" ), mailmenu );
         menubar->insertItem( tr( "Servers" ), servermenu );
 
         addToolBar(toolbar);
         toolbar->setHorizontalStretchable(true);
 
         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);
 
diff --git a/noncore/unsupported/mail2/mainwindowbase.h b/noncore/unsupported/mail2/mainwindowbase.h
index 11c5ea0..b2e1dc5 100644
--- a/noncore/unsupported/mail2/mainwindowbase.h
+++ b/noncore/unsupported/mail2/mainwindowbase.h
@@ -1,37 +1,37 @@
 #ifndef MAINWINDOWBASE_H
 #define MAINWINDOWBASE_H
 
 #include <qmainwindow.h>
 
 class ServerConnection;
 class MailStatusBar;
 class FolderWidget;
 class QPEToolBar;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 class MailTable;
 class QAction;
 
 class MainWindowBase : public QMainWindow
 {
         Q_OBJECT
 
 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;
-         QPEMenuBar *menubar;
+         QMenuBar *menubar;
         QPopupMenu *mailmenu, *servermenu;
         MailTable *mailView;
         QAction *compose, *sendQueue, *folders, *findmails, *configure;
 
 };
 
 #endif
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index a02f73a..10aa14d 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -6,33 +6,33 @@
 #include <qpopupmenu.h>
 
 #include <qpe/qpetoolbar.h>
 #include <qpe/qpemenubar.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);
-  menubar = new QPEMenuBar( toolbar );
+  menubar = new QMenuBar( toolbar );
   mailmenu = new QPopupMenu( menubar );
   menubar->insertItem( tr( "Mail" ), mailmenu );
 
         toolbar->setHorizontalStretchable(true);
         addToolBar(toolbar);
 
         QLabel *spacer = new QLabel(toolbar);
         spacer->setBackgroundMode(QWidget::PaletteButton);
         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);
diff --git a/noncore/unsupported/mail2/viewmailbase.h b/noncore/unsupported/mail2/viewmailbase.h
index ba82017..6e55021 100644
--- a/noncore/unsupported/mail2/viewmailbase.h
+++ b/noncore/unsupported/mail2/viewmailbase.h
@@ -1,36 +1,36 @@
 #ifndef VIEWMAILBASE_H
 #define VIEWMAILBASE_H
 
 #include <qmainwindow.h>
 
 class QAction;
 class OpenDiag;
 class QListView;
 class QPEToolBar;
 class QTextBrowser;
-class QPEMenuBar;
+class QMenuBar;
 class QPopupMenu;
 
 class ViewMailBase : public QMainWindow
 {
         Q_OBJECT
 
 public:
         ViewMailBase(QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
 
 protected:
         QAction *reply, *forward, *attachbutton, *deleteMail;
         QListView *attachments;
         QPEToolBar *toolbar;
         QTextBrowser *browser;
         OpenDiag *openDiag;
-         QPEMenuBar *menubar;
+         QMenuBar *menubar;
   QPopupMenu *mailmenu;
 
 protected slots:
         void slotChangeAttachview(bool state);
 
 };
 
 #endif
 
diff --git a/noncore/unsupported/oipkg/mainwindow.cpp b/noncore/unsupported/oipkg/mainwindow.cpp
index 04362d3..6930d60 100644
--- a/noncore/unsupported/oipkg/mainwindow.cpp
+++ b/noncore/unsupported/oipkg/mainwindow.cpp
@@ -1,32 +1,32 @@
 /***************************************************************************
  *                                                                         *
  *   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 <qpe/qpemenubar.h>
+#include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/qpetoolbar.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qtoolbutton.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qfile.h>
 #include <qlistview.h>
 #include <qtextview.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
@@ -70,33 +70,33 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   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 );
-  QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+  QMenuBar *menuBar = new QMenuBar( toolBar );
   QPopupMenu *srvMenu = new QPopupMenu( menuBar );
   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
   QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
   QPopupMenu *helpMenu = new QPopupMenu( menuBar );
 
   setToolBarsMovable( false );
   toolBar->setHorizontalStretchable( true );
   menuBar->insertItem( tr( "Package" ), srvMenu );
   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 );