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,105 +1,105 @@
 //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") );
  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 ");
  item = new QListViewItem( m_SuggestedCommandList,"netstat ");
  item = new QListViewItem( m_SuggestedCommandList,"route ");
  item = new QListViewItem( m_SuggestedCommandList,"cardctl eject ");
  m_SuggestedCommandList->setSelected(m_SuggestedCommandList->firstChild(),TRUE);
  m_SuggestedCommandList->sort();
  connect( m_SuggestedCommandList, SIGNAL( clicked( QListViewItem * ) ), m_PlayListSelection, SLOT( addToSelection( QListViewItem *) ) );
  ToolButton1->setTextLabel("new");
  ToolButton1->setPixmap(Resource::loadPixmap("new"));
  ToolButton1->setAutoRaise(TRUE);
  ToolButton1->setFocusPolicy(QWidget::NoFocus);
  connect(ToolButton1,SIGNAL(clicked()),this,SLOT(showAddDialog()));
  ToolButton2->setTextLabel("edit");
  ToolButton2->setPixmap(Resource::loadPixmap("edit"));
  ToolButton2->setAutoRaise(TRUE);
  ToolButton2->setFocusPolicy(QWidget::NoFocus);
  connect(ToolButton2,SIGNAL(clicked()),this,SLOT(showEditDialog()));
  ToolButton3->setTextLabel("delete");
  ToolButton3->setPixmap(Resource::loadPixmap("editdelete"));
  ToolButton3->setAutoRaise(TRUE);
  ToolButton3->setFocusPolicy(QWidget::NoFocus);
  connect(ToolButton3,SIGNAL(clicked()),m_PlayListSelection,SLOT(removeSelected()));
  ToolButton4->setTextLabel("up");
  ToolButton4->setPixmap(Resource::loadPixmap("up"));
  ToolButton4->setAutoRaise(TRUE);
  ToolButton4->setFocusPolicy(QWidget::NoFocus);
  connect(ToolButton4,SIGNAL(clicked()),m_PlayListSelection,SLOT(moveSelectedUp()));
  ToolButton5->setTextLabel("down");
  ToolButton5->setPixmap(Resource::loadPixmap("down"));
  ToolButton5->setAutoRaise(TRUE);
  ToolButton5->setFocusPolicy(QWidget::NoFocus);
 connect(ToolButton5,SIGNAL(clicked()),m_PlayListSelection,SLOT(moveSelectedDown()));
  QListViewItem *current = m_SuggestedCommandList->selectedItem();
    if ( current )
        item->moveItem( current );
    m_SuggestedCommandList->setSelected( item, TRUE );
    m_SuggestedCommandList->ensureItemVisible( m_SuggestedCommandList->selectedItem() );
  Config cfg("Konsole");
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
@@ -1,132 +1,132 @@
 /* ---------------------------------------------------------------------- */
 /*                                                                        */
 /* [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 <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>
 #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;
        left = t;
    }
      }
      if ( left ) {
    left->setText(QString::number(i+1));
    m = left->rect().x();
      }
  }
    }
 };
 class EKNumTabWidget : public QTabWidget {
 public:
    EKNumTabWidget(QWidget* parent) : QTabWidget(parent)
    {
    }
    void addTab(QWidget* w)
    {
  QTab* t = new QTab(QString::number(tabBar()->count()+1));
  QTabWidget::addTab(w,t);
    }
    void removeTab(QWidget* w)
    {
  removePage(w);
  ((EKNumTabBar*)tabBar())->numberTabs();
    }
 };
 // This could be configurable or dynamicly generated from the bash history
 // file of the user
 static const char *commonCmds[] =
 {
    "ls ", // I left this here, cause it looks better than the first alpha
    "cardctl eject",
    "cat ",
    "cd ",
    "chmod ",
    "clear",
    "cp ",
    "dc ",
    "df ",
    "dmesg",
    "echo ",
    "env",
    "find ",
    "free",
    "grep ",
    "ifconfig ",
    "ipkg ",
    "mkdir ",
    "mv ",
@@ -192,193 +192,193 @@ static void konsoleInit(const char** shell) {
    if (shell == NULL || *shell == '\0') {
        struct passwd *ent = 0;
        uid_t me = getuid();
        *shell = "/bin/sh";
        while ( (ent = getpwent()) != 0 ) {
            if (ent->pw_uid == me) {
                if (ent->pw_shell != "")
                    *shell = ent->pw_shell;
                break;
            }
        }
        endpwent();
    }
    qWarning("SHELL now is %s", *shell );
    if( putenv((char*)"COLORTERM=") !=0)
        qDebug("putenv failed"); // to trigger mc's color detection
 }
 Konsole::Konsole(QWidget* parent, const char* name, WFlags fl) :
    QMainWindow(parent, name, fl)
 {
    QStrList tmp; const char* shell;
    setCaption( tr("Terminal") );
    konsoleInit( &shell);
    qWarning("Using shell %s", shell);
    init(shell,tmp);
 }
 void Konsole::initCommandList()
 {
 //    qDebug("Konsole::initCommandList");
    Config cfg("Konsole");
    cfg.setGroup("Commands");
    commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
    commonCombo->clear();
    if (cfg.readEntry("Commands Set","FALSE") == "FALSE") {
        for (int i = 0; commonCmds[i] != NULL; i++) {
            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 );
  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;
  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 );
  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->setHorizontalStretchable( TRUE );
  commonCombo = new QComboBox( secondToolBar );
  commonCombo->setMaximumWidth(236);
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
@@ -1,183 +1,183 @@
 /**********************************************************************
 ** 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 <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>
 #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 );
    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 ) ),
             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&)) );
 }
 void HelpBrowser::appMessage(const QCString& msg, const QByteArray& data)
 {
        qDebug("reached appMessage");
    if ( msg == "showFile(QString)" ) {
        QDataStream ds(data,IO_ReadOnly);
        QString fn;
        ds >> fn;
        setDocument( fn );
        QPEApplication::setKeepRunning();
        showMaximized();
        setActiveWindow();
        raise();
    }
 }
 void HelpBrowser::setDocument( const QString &doc )
 {
    if ( !doc.isEmpty() )
        browser->setSource( doc );
    raise();
 }
 void HelpBrowser::textChanged()
 {
    if ( browser->documentTitle().isNull() )
        setCaption( tr("Help Browser") );
    else
        setCaption( browser->documentTitle() ) ;
    selectedURL = caption();
 }
 HelpBrowser::~HelpBrowser()
 {
    QStringList bookmarks;
    QMap<int, Bookmark>::Iterator it2 = mBookmarks.begin();
    for ( ; it2 != mBookmarks.end(); ++it2 )
        bookmarks.append( (*it2).name + "=" + (*it2).file );
    QFile f2( Global::applicationFileName("helpbrowser", "bookmarks") );
    if ( f2.open( IO_WriteOnly ) ) {
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
@@ -1,285 +1,285 @@
 /**********************************************************************
 // 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 <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>
 #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:
      /*
 signals:
    void notFound();
    void searchWrapped();
    */
 private:
 };
 void QpeEditor::mousePressEvent( QMouseEvent *e ) {
 switch(e->button()) {
   case RightButton:
   { //rediculous workaround for qt popup menu
     //and the hold right click mechanism
       this->setSelection( line1, col1, line2, col2);
       QMultiLineEdit::mousePressEvent( e );
       markIt = false;
   }
   break;
   default:
   {
       if(!markIt) {
           int line, col;
           this->getCursorPosition(&line, &col);
           line1=line2=line;
           col1=col2=col;
       }
       QMultiLineEdit::mousePressEvent( e );
   }
       break;
 };
 }
 void QpeEditor::mouseReleaseEvent( QMouseEvent * ) {
    if(this->hasMarkedText()) {
        markIt = true;
        this->getMarkedRegion( &line1, &col1, &line2, & col2 );
    } else {
       markIt = false;
    }
 }
 void QpeEditor::find ( const QString &txt, bool caseSensitive,
           bool backwards )
 {
    static bool wrap = false;
    int line, col;
    if ( wrap ) {
        if ( !backwards )
            line = col = 0;
        wrap = false;
          //  emit searchWrapped();
    } else {
        getCursorPosition( &line, &col );
    }
      //ignore backwards for now....
    if ( !backwards ) {
        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 );
    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" ),
                     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 );
    connect( a, SIGNAL( activated() ), this, SLOT( editPasteTimeDate() ) );
    a->addTo( edit );
 #endif
       a = new QAction( tr( "Goto Line..." ), Resource::loadPixmap( "find" ),
                    QString::null, 0, this, 0 );
   connect( a, SIGNAL( activated() ), this, SLOT( gotoLine() ) );
    edit->insertSeparator();
   a->addTo( edit );
    a = new QAction( tr( "Find..." ), Resource::loadPixmap( "find" ),
                     QString::null, 0, this, 0 );
    connect( a, SIGNAL( activated() ), this, SLOT( editFind() ) );
    a->addTo( bar );
    a->addTo( edit );
    zin = new QAction( tr("Zoom in"), QString::null, 0, this, 0 );
    connect( zin, SIGNAL( activated() ), this, SLOT( zoomIn() ) );
    zin->addTo( font );
    zout = new QAction( tr("Zoom out"), QString::null, 0, this, 0 );
    connect( zout, SIGNAL( activated() ), this, SLOT( zoomOut() ) );
    zout->addTo( font );
    font->insertSeparator();
    font->insertItem(tr("Font"), this, SLOT(changeFont()) );
    font->insertSeparator();
    font->insertItem(tr("Advanced Features"), advancedMenu);
    QAction *wa = new QAction( tr("Wrap lines"),
                               QString::null, 0, this, 0 );
    connect( wa, SIGNAL( toggled(bool) ),
             this, SLOT( setWordWrap(bool) ) );
    wa->setToggleAction(true);
    wa->addTo( advancedMenu);
    nStart = new QAction( tr("Start with new file"),
                          QString::null, 0, this, 0 );
    connect( nStart, SIGNAL( toggled(bool) ),
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
@@ -1,257 +1,257 @@
 /**********************************************************************
 ** 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 <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>
 #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>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
 extern AudioWidget *audioUI;
 extern VideoWidget *videoUI;
 extern MediaPlayerState *mediaPlayerState;
 static inline QString fullBaseName ( const QFileInfo &fi )
 {
  QString str = fi. fileName ( );
  return str. left ( str. findRev ( '.' ));
 }
 QString audioMimes ="audio/mpeg;audio/x-wav;application/ogg;audio/x-mod";
 // class myFileSelector {
 // };
 class PlayListWidgetPrivate {
 public:
    QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
    QFrame *playListFrame;
    FileSelector *files;
    PlayListSelection *selectedFiles;
    bool setDocumentUsed;
    DocLnk *current;
 };
 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 );
    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 );
    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 ) ) );
    populateSkinsMenu();
    QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
    QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
    QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
    
    tabWidget = new QTabWidget( hbox6, "tabWidget" );
 //    tabWidget->setTabShape(QTabWidget::Triangular);
    
    QWidget *pTab;
    pTab = new QWidget( tabWidget, "pTab" );
 //      playlistView = new QListView( pTab, "playlistview" );
 //    playlistView->setMinimumSize(236,260);
    tabWidget->insertTab( pTab,"Playlist");
    // Add the playlist area
  
    QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
    d->playListFrame = vbox3;
    QGridLayout *layoutF = new QGridLayout( pTab );
    layoutF->setSpacing( 2);
    layoutF->setMargin( 2);
    layoutF->addMultiCellWidget( d->playListFrame , 0, 0, 0, 1 );
    QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
    d->selectedFiles = new PlayListSelection( hbox2);
    QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
    QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
          
    QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
    new ToolButton( vbox1, tr( "Move Up" ),   "opieplayer/up",   d->selectedFiles, SLOT(moveSelectedUp()) );
    new ToolButton( vbox1, tr( "Remove" ),    "opieplayer/cut",  d->selectedFiles, SLOT(removeSelected()) );
    new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
    QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
    QWidget *aTab;
    aTab = new QWidget( tabWidget, "aTab" );
    audioView = new QListView( aTab, "Audioview" );
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
@@ -1,192 +1,192 @@
 /**********************************************************************
 ** 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 <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>
 #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 );
        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() );
        // 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
        a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ),
                         QString::null, 0, this, 0 );
        actionFind = a;
        connect( a, SIGNAL(activated()), this, SLOT( slotFindOpen()) );
        a->addTo( edit );
        a->addTo( listTools );
        // Much better search widget, taken from QTReader.. (se)
        searchBar = new OFloatBar( "Search", this, QMainWindow::Top, TRUE );
        searchBar->setHorizontalStretchable( TRUE );
        searchBar->hide();
        searchEdit = new QLineEdit( searchBar, "searchEdit" );
        // QFont f("unifont", 16 /*, QFont::Bold*/);
        // searchEdit->setFont( f );
        searchBar->setStretchableWidget( searchEdit );
        connect( searchEdit, SIGNAL( returnPressed( ) ),
                 this, SLOT( slotFind( ) ) );
        a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotFind() ) );
        a->addTo( searchBar );
        a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotFindClose() ) );
        a->addTo( searchBar );
        a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "addressbook/sendmail" ),
                         QString::null, 0, this, 0 );
        //a->setEnabled( FALSE ); we got support for it now :) zecke
        actionMail = a;
        connect( a, SIGNAL( activated() ), this, SLOT( writeMail() ) );
        a->addTo( edit );
        a->addTo( listTools );
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
@@ -1,202 +1,202 @@
 /**********************************************************************
 ** 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 <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>
 #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 );
 //    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();
        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();
        a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), QString::null, 0, this, 0 );
        connect( a, SIGNAL(activated()), this, SLOT(slotFind()) );
        a->addTo( sub_bar );
        a = new QAction( tr( "Edit..." ), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0 );
        connect( a, SIGNAL( activated() ), this, SLOT( slotSettings() ) );
        a->addTo( sub_bar );
        if(defaultView==DAY) viewDay();
                if(defaultView==WEEK) needEvilHack=true;// viewWeek();
        if(defaultView==WEEKLST) viewWeekLst();
        if(defaultView==MONTH) viewMonth();
        connect( qApp, SIGNAL(clockChanged(bool)), this, SLOT(changeClock(bool)) );
        connect( qApp, SIGNAL(weekChanged(bool)), this, SLOT(changeWeek(bool)) );
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
        connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray&)), this, SLOT(appMessage(const QCString&, const QByteArray&)) );
 #endif
    // listen on QPE/System
 #if defined(Q_WS_QWS)
 #if !defined(QT_NO_COP)
        QCopChannel *channel = new QCopChannel( "QPE/System", this );
        connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
        channel = new QCopChannel( "QPE/Datebook", this );
        connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) );
        qDebug("olle\n");
 #endif
 #endif
        qDebug("done t=%d", t.elapsed() );
        connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
        connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
    /*
     *  Here is a problem description:
     *  When Weekview is the default view
     *  a DateBookWeekView get's created
     *  redraw() get's called. So what?
     *  Remember that we're still in the c'tor
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,192 +1,192 @@
 #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" )
 {
    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->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 );
    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 );
    connect(a, SIGNAL( activated() ), this, SLOT(slotConfigureDesc() ) );
    a = new QAction( tr("Configure Templates"), QString::null, 0, 0 );
    a->addTo( m_popSetting );
    connect(a, SIGNAL( activated() ), this, SLOT(slotConfigureTemp() ) );
    connect( qApp, SIGNAL(clockChanged(bool) ),
             this, SLOT(slotClockChanged(bool) ) );
    connect( qApp, SIGNAL(weekChanged(bool) ),
             this, SLOT(slotWeekChanged(bool) ) );
    connect( qApp, SIGNAL(appMessage(const QCString&, const QByteArray& ) ),
             this, SLOT(slotAppMessage( const QCString&, const QByteArray& ) ) );
 }
 void MainWindow::initConfig() {
 }
 void MainWindow::initView() {
 }
 void MainWindow::initManagers() {
    m_manager = new BookManager;
    m_tempMan.load();
    m_locMan.load();
    m_descMan.load();
    setTemplateMenu();
 }
 void MainWindow::raiseCurrentView() {
 }
 /*
 * populate the view
 */
 void MainWindow::populate() {
    if (!manager()->isLoaded() )
        manager()->load();
 }
 void MainWindow::slotGoToNow() {
 }
 View* MainWindow::currentView() {
 }
 void MainWindow::slotFind() {
 }
 void MainWindow::slotConfigure() {
 }
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
@@ -1,214 +1,214 @@
 /***************************************************************************
 *                                                                         *
 *   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 <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"
 #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 );
   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){
                        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 & ) ) );
 }
 MainWindow::~MainWindow()
 {
   Config cfg( "osearch", Config::User );
   cfg.setGroup( "search_settings" );
   cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() );
   cfg.writeEntry( "wildcards", actionWildcards->isOn() );
   //cfg.writeEntry( "whole_words_only", actionWholeWordsOnly->isOn() );
 }
 void MainWindow::setCurrent(QListViewItem *item)
 {
        if (!item) return;
        _currentItem = (OListViewItem*)item;
        //_currentItem = dynamic_cast<OListViewItem*>(item);
        if (_currentItem->rtti() == OListViewItem::Result){
                ResultItem *res = (ResultItem*)item;
        //      ResultItem *res = dynamic_cast<ResultItem*>(item);
                richEdit->setText( res->toRichText() );
                QIntDict<QString> acts = res->actions();
                QButton *button;
                for (uint i = 0; i < acts.count(); i++){
                        button = buttonMap[i];
                        if (!button) {
                            qWarning(" no button for %s", (*acts[i]).latin1() );
                            button = new QPushButton( buttonBox );
                            buttonMap.insert( i,  button );
                            signalMapper->setMapping(button, i );
                            connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
                        }
                        button->setText( *acts[i] );
                        button->show();
                }
                for (uint i = acts.count(); i < _buttonCount; i++){
                        button = buttonMap[i];
                        if (button) button->hide();
                }
                _buttonCount = acts.count();
                detailsFrame->show();
                buttonBox->show();
        }else {
            detailsFrame->hide();
            buttonBox->hide();
        }
        popupTimer->start( 300, true );
 }
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
@@ -1,165 +1,165 @@
 /*
 � � � � � � � �              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 <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 );
        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 );
        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 );
                }
        }
        // Build Checkbook selection list control
        cbList = 0x0;
        buildList();
    // open last book?
    if( _cfg.isOpenLastBook() ) {
        this->show();
        this->showMaximized();
        QListViewItem *itm=cbList->firstChild();
        while( itm ) {
            if( itm->text(posName)==_cfg.getLastBook() ) {
                openBook( itm );
                break;
            }
            itm=itm->nextSibling();
        }
    }
 }
 // --- ~MainWindow ------------------------------------------------------------
 MainWindow::~MainWindow()
 {
    writeConfig();
 }
 // --- buildList --------------------------------------------------------------
 void MainWindow::buildList()
 {
        if ( cbList )
                        delete cbList;
        cbList = new QListView( this );
        QWhatsThis::add( cbList, tr( "This is a listing of all checkbooks currently available." ) );
        if ( _cfg.getShowLocks() )
        {
                cbList->addColumn( Resource::loadIconSet( "locked" ), "", 24 );
                posName = 1;
        }
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,116 +1,110 @@
 /***************************************************************************
 *                                                                         *
 *   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"
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
  QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0)
 {
  setCaption( tr("Conf File Editor") );
        //setBaseSize(  qApp->globalStrut() );
  setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
  mainLayout = new QVBoxLayout( this );
        mainLayout->setSpacing( 0 );
  mainLayout->setMargin( 0 );
  qDebug("creating settingList");
  settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist");
  settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
  mainLayout->addWidget( settingList, 0);
  qDebug("creating editor");
  editor = new EditWidget(this);
  editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) );
  mainLayout->addWidget( editor, 1 );
  editor->layoutType( ListViewItemConf::File );
  makeMenu();
  connect(settingList, SIGNAL( pressed(QListViewItem*) ),
                                                this, SLOT(setCurrent(QListViewItem*)));
        connect( settingList, SIGNAL( clicked( QListViewItem* ) ),
                                           this, SLOT( stopTimer( QListViewItem* ) ) );
         connect( editor->LineEditGroup, SIGNAL( textChanged(const QString&) ),
                   SLOT( groupChanged(const QString&) ) );
        connect( editor->LineEditKey, SIGNAL( textChanged(const QString&) ),
                   SLOT( keyChanged(const QString&) ) );
         connect( editor->LineEditValue, SIGNAL( textChanged(const QString&) ),
                   SLOT( valueChanged(const QString&) ) );
         setCurrent(0);
  editor->layoutType(EditWidget::File);
 }
 void MainWindow::makeMenu()
 {
  popupTimer = new QTimer(this);
  popupMenuFile = new QPopupMenu(this);
  popupMenuEntry = new QPopupMenu(this);
        popupActionSave = new QAction( tr("Save"),QString::null,  0, this, 0 );
        popupActionSave->addTo( popupMenuFile );
 // popupActionSave->addTo( popupMenuEntry );
  connect( popupActionSave, SIGNAL( activated() ),
                                 this , SLOT( saveConfFile() ) );
        popupActionRevert = new QAction( tr("Revert"),QString::null,  0, this, 0 );
        popupActionRevert->addTo( popupMenuFile );
  popupActionRevert->addTo( popupMenuEntry );
  connect( popupActionRevert, SIGNAL( activated() ),
                                 this , SLOT( revertConfFile() ) );
  popupActionDelete = new QAction( tr("Delete"),QString::null,  0, this, 0 );
        popupActionDelete->addTo( popupMenuFile );
  popupActionDelete->addTo( popupMenuEntry );
  connect( popupActionDelete, SIGNAL( activated() ),
                                 this , SLOT( removeConfFile() ) );
  connect( popupTimer, SIGNAL(timeout()),
                                        this, SLOT(showPopup()) );
 }
 MainWindow::~MainWindow()
 {
 }
 void MainWindow::setCurrent(QListViewItem *item)
 {
        //qDebug("MainWindow::setCurrent");
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
@@ -1,166 +1,166 @@
 /****************************************************************************
 **
 ** 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 <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->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) ));
    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);
    connect(DrinkView, SIGNAL( doubleClicked(QListViewItem*)),this,SLOT(showDrink( QListViewItem*)));
    connect(DrinkView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
            this,SLOT( showDrink(int, QListViewItem *, const QPoint&, int)));
    layout->addMultiCellWidget( DrinkView, 1, 2, 0, 4 );
    if(QDir("db").exists()) {
        dbFile.setName( "db/drinkdb.txt");
    } else
        dbFile.setName( QPEApplication::qpeDir()+"/etc/bartender/drinkdb.txt");
    initDrinkDb();
 }
 Bartender::~Bartender() {
 }
 /*
 this happens right before exit  */
 void Bartender::cleanUp() {
   dbFile.close();
 }
 void Bartender::initDrinkDb() {
    if(!dbFile.isOpen())
    if ( !dbFile.open( IO_ReadOnly)) {
        QMessageBox::message( (tr("Note")), (tr("Drink database not opened sucessfully.\n")) );
        return;
    }
    fillList();
 }
 void Bartender::fillList() {
    dbFile.at(1);
    DrinkView->clear();
    int i=0;
    QListViewItem * item ;
    QTextStream t( &dbFile);
    QString s;
    while ( !t.eof()) {
        s = t.readLine();
        if(s.find("#",0,TRUE) != -1) {
 //            qDebug(s.right(s.length()-2));
            item= new QListViewItem( DrinkView, 0 );
            item->setText( 0, s.right(s.length()-2));
            i++;
        }
    }
    qDebug("there are currently %d of drinks", i);
 }
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
@@ -189,193 +189,193 @@ void QTReaderApp::hidetoolbars()
    if (fileBar != NULL) fileBar->hide();
    if (viewBar != NULL) viewBar->hide();
    if (navBar != NULL) navBar->hide();
    if (markBar != NULL) markBar->hide();
    if (m_fontVisible) m_fontBar->hide();
    if (regVisible)
    {
 #ifdef USEQPE
                Global::hideInputMethod();
 #endif
        regBar->hide();
    }
    if (searchVisible)
    {
 #ifdef USEQPE
                Global::hideInputMethod();
 #endif
        searchBar->hide();
    }
 }
 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 );
 //    menubar = new QPEToolBar( 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 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 );
    QPopupMenu *view = new QPopupMenu( mb );
    tmp->insertItem( tr( "View" ), view );
    QPopupMenu *marks = new QPopupMenu( this );
    tmp->insertItem( tr( "Marks" ), marks );
    QPopupMenu *settings = new QPopupMenu( this );
    tmp->insertItem( tr( "Settings" ), settings );
 //    addToolBar(menubar, "Menus",QMainWindow::Top);
 //    addToolBar(fileBar, "Toolbar",QMainWindow::Top);
    //    QPopupMenu *edit = new QPopupMenu( this );
    /*
    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 );
    */
    editorStack = new QWidgetStack( this );
    setCentralWidget( editorStack );
    searchVisible = FALSE;
    regVisible = FALSE;
    m_fontVisible = false;
    m_annoWin = new CAnnoEdit(editorStack);
    editorStack->addWidget(m_annoWin, get_unique_id());
    connect( m_annoWin, SIGNAL( finished(const QString&, const QString&) ), this, SLOT( addAnno(const QString&, const QString&) ) );
    connect( m_annoWin, SIGNAL( cancelled() ), this, SLOT( infoClose() ) );
    m_infoWin = new infowin(editorStack);
    editorStack->addWidget(m_infoWin, get_unique_id());
    connect( m_infoWin, SIGNAL( Close() ), this, SLOT( infoClose() ) );
    m_graphicwin = new GraphicWin(editorStack);
    editorStack->addWidget(m_graphicwin, get_unique_id());
    connect( m_graphicwin, SIGNAL( Closed() ), this, SLOT( infoClose() ) );
 //    bkmkselector = new QListBox(editorStack, "Bookmarks");
    bkmkselector = new CBkmkSelector(editorStack, "Bookmarks");
    //    connect(bkmkselector, SIGNAL( selected(const QString&) ), this, SLOT( gotobkmk(const QString&) ) );
    connect(bkmkselector, SIGNAL( selected(int) ), this, SLOT( gotobkmk(int) ) );
    connect(bkmkselector, SIGNAL( cancelled() ), this, SLOT( cancelbkmk() ) );
    editorStack->addWidget( bkmkselector, get_unique_id() );
 /*
    importSelector = new FileSelector( "*", editorStack, "importselector", false );
    connect( importSelector, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( importFile( const DocLnk & ) ) );
    editorStack->addWidget( importSelector, get_unique_id() );
    // don't need the close visible, it is redundant...
    importSelector->setCloseVisible( FALSE );
 */    
 //    qDebug("Reading file list");
    readfilelist();
    reader = new QTReader( editorStack );
    reader->bDoUpdates = false;
 #ifdef USEQPE
    ((QPEApplication*)qApp)->setStylusOperation(reader, QPEApplication::RightOnHold);
 #endif
 //    qDebug("Reading config");
 //  Config config( APPDIR );
  config.setGroup( "View" );
  m_debounce = config.readNumEntry("Debounce", 0);
 #ifdef USEQPE
  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", false);
 #else
  m_bFloatingDialog = config.readBoolEntry("FloatDialogs", true);
 #endif
  reader->bstripcr = config.readBoolEntry( "StripCr", true );
  reader->bfulljust = config.readBoolEntry( "FullJust", false );
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
@@ -1,144 +1,144 @@
 /**********************************************************************
 ** 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 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,
    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
 {
    cAutoGen,
    cAddBkmk,
    cJump,
    cMonoSpace,
    cSetTarget,
 #ifdef _SCROLLPIPE
    cSetPipeTarget,
 #endif
    cSetConfigName,
    cMargin,
    cExtraSpace,
    cExtraLead
 };
 enum bkmk_action
 {
    cOpenFile,
    cGotoBkmk,
    cDelBkmk,
    cRmBkmkFile,
    cLdConfig,
    cRmConfig,
    cExportLinks
 };
 enum fontselector_action
 {
    cChooseFont,
    cChooseEncoding
 };
 #ifdef __ISEARCH
 struct searchrecord
 {
  QString s;
  size_t pos;
  searchrecord(const QString& _s, size_t _pos) : s(_s), pos(_pos) {}
 };
 #endif
 class infowin;
 class GraphicWin;
 class QTReaderApp : public QMainWindow
 {
    Q_OBJECT
        unsigned long m_savedpos;
    int m_debounce;
@@ -290,153 +290,153 @@ private slots:
 //    void embolden(bool);
 //    void autofmt(bool);
 //    void textfmt(bool);
 //    void striphtml(bool);
 //    void dehyphen(bool);
 //    void depluck(bool);
 //    void dejpluck(bool);
 //    void unindent(bool);
 //    void repara(bool);
 //    void dblspce(bool);
    void pagemode(bool);
    //  void gotobkmk(const QString& bm);
    void gotobkmk(int);
    void cancelbkmk();
    void do_gotomark();
    void do_delmark();
    void do_autogen();
    void do_regaction();
    void OnRedraw();
 private:
    void writeUrl(const QString& file, const QString& href);
    QAction *m_preferences_action, *m_open_action, *m_close_action;
    QAction *m_info_action, *m_touch_action, *m_find_action, *m_start_action;
    QAction *m_end_action, *m_jump_action, *m_pageline_action;
    QAction *m_pageup_action, *m_pagedn_action, *m_back_action;
    QAction *m_home_action, *m_forward_action, *m_zoomin_action;
    QAction *m_zoomout_action, *m_setfont_action, *m_mark_action;
    QAction *m_annotate_action, *m_goto_action, *m_delete_action;
    QAction *m_autogen_action, *m_clear_action, *m_save_action;
    QAction *m_tidy_action, *m_startBlock_action, *m_endBlock_action;
    QAction *m_setenc_action, *m_setmono_action, *m_saveconfig_action;
    QAction *m_loadconfig_action, *m_toolbarprefs_action, *m_tidyconfig_action;
    QAction *m_exportlinks_action;
    void addtoolbars(Config* config);
    ToolbarPolicy m_tbpol, m_tbpolsave;
    ToolBarDock m_tbposition;
    bool m_tbmove, m_tbmovesave;
    QToolBar* filebar();
    QToolBar* viewbar();
    QToolBar* navbar();
    QToolBar* markbar();
    void hidetoolbars();
    void addfilebar(Config* _config, const QString& key, QAction* a);
    void addviewbar(Config* _config, const QString& key, QAction* a);
    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 *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());
 //      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;
 //const int cMargin = 12;
 //const int cExtraSpace = 14;
 //const int cExtraLead = 15;
 //const int cGfxSize = 16;
 //const int cChooseFont = 2;
 //const int cChooseEncoding = 1;
 #endif
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
@@ -268,193 +268,193 @@ void MainWindow::initActions()
  connect(fileOpen, SIGNAL(activated()), this, SLOT(slotFileOpen()));
  fileSave=new QAction(tr("Save File"),Resource::loadPixmap( "save" ), tr("&Save"), 0, this);
  connect(fileSave, SIGNAL(activated()), this, SLOT(slotFileSave()));
  fileSaveAs=new QAction(tr("Save File As"), Resource::loadPixmap( "save" ), tr("Save &As"), 0, this);
  connect(fileSaveAs, SIGNAL(activated()), this, SLOT(slotFileSaveAs()));
  //fileQuit=new QAction(tr("Quit"), tr("&Quit"), 0, this);
  //connect(fileQuit, SIGNAL(activated()), this, SLOT(close()));
  // helpGeneral=new QAction(tr("General Help"), QPixmap(help_general_xpm), tr("&General"), 0, this);
  //connect(helpGeneral, SIGNAL(activated()), this, SLOT(slotHelpGeneral()));
  //helpAbout=new QAction(tr("About Opie Sheet"), tr("&About"), 0, this);
  //connect(helpAbout, SIGNAL(activated()), this, SLOT(slotHelpAbout()));
  editAccept=new QAction(tr("Accept"),Resource::loadPixmap( "enter" ) , tr("&Accept"), 0, this);
  connect(editAccept, SIGNAL(activated()), this, SLOT(slotEditAccept()));
  editCancel=new QAction(tr("Cancel"), Resource::loadPixmap( "close" ), tr("&Cancel"), 0, this);
  connect(editCancel, SIGNAL(activated()), this, SLOT(slotEditCancel()));
  editCellSelect=new QAction(tr("Cell Selector"), QPixmap(cell_select_xpm), tr("Cell &Selector"), 0, this);
  editCellSelect->setToggleAction(TRUE);
  connect(editCellSelect, SIGNAL(toggled(bool)), this, SLOT(slotCellSelect(bool)));
  editCut=new QAction(tr("Cut Cells"), tr("Cu&t"), 0, this);
  editCopy=new QAction(tr("Copy Cells"), tr("&Copy"), 0, this);
  editPaste=new QAction(tr("Paste Cells"), tr("&Paste"), 0, this);
  connect(editPaste, SIGNAL(activated()), this, SLOT(slotEditPaste()));
  editPasteContents=new QAction(tr("Paste Contents"), tr("Paste Cont&ents"), 0, this);
  connect(editPasteContents, SIGNAL(activated()), this, SLOT(slotEditPasteContents()));
  editClear=new QAction(tr("Clear Cells"), tr("C&lear"), 0, this);
  insertCells=new QAction(tr("Insert Cells"), tr("C&ells"), 0, this);
  connect(insertCells, SIGNAL(activated()), this, SLOT(slotInsertCells()));
  insertRows=new QAction(tr("Insert Rows"), tr("&Rows"), 0, this);
  connect(insertRows, SIGNAL(activated()), this, SLOT(slotInsertRows()));
  insertCols=new QAction(tr("Insert Columns"), tr("&Columns"), 0, this);
  connect(insertCols, SIGNAL(activated()), this, SLOT(slotInsertCols()));
  insertSheets=new QAction(tr("Add Sheets"), tr("&Sheets"), 0, this);
  connect(insertSheets, SIGNAL(activated()), this, SLOT(slotInsertSheets()));
  formatCells=new QAction(tr("Cells"), tr("&Cells"), 0, this);
  connect(formatCells, SIGNAL(activated()), this, SLOT(slotFormatCells()));
  rowHeight=new QAction(tr("Row Height"), tr("H&eight"), 0, this);
  connect(rowHeight, SIGNAL(activated()), this, SLOT(slotRowHeight()));
  rowAdjust=new QAction(tr("Adjust Row"), tr("&Adjust"), 0, this);
  connect(rowAdjust, SIGNAL(activated()), this, SLOT(slotRowAdjust()));
  rowShow=new QAction(tr("Show Row"), tr("&Show"), 0, this);
  connect(rowShow, SIGNAL(activated()), this, SLOT(slotRowShow()));
  rowHide=new QAction(tr("Hide Row"), tr("&Hide"), 0, this);
  connect(rowHide, SIGNAL(activated()), this, SLOT(slotRowHide()));
  colWidth=new QAction(tr("Column Width"), tr("&Width"), 0, this);
  connect(colWidth, SIGNAL(activated()), this, SLOT(slotColumnWidth()));
  colAdjust=new QAction(tr("Adjust Column"), tr("&Adjust"), 0, this);
  connect(colAdjust, SIGNAL(activated()), this, SLOT(slotColumnAdjust()));
  colShow=new QAction(tr("Show Column"), tr("&Show"), 0, this);
  connect(colShow, SIGNAL(activated()), this, SLOT(slotColumnShow()));
  colHide=new QAction(tr("Hide Column"), tr("&Hide"), 0, this);
  connect(colHide, SIGNAL(activated()), this, SLOT(slotColumnHide()));
  sheetRename=new QAction(tr("Rename Sheet"), tr("&Rename"), 0, this);
  connect(sheetRename, SIGNAL(activated()), this, SLOT(slotSheetRename()));
  sheetRemove=new QAction(tr("Remove Sheet"), tr("R&emove"), 0, this);
  connect(sheetRemove, SIGNAL(activated()), this, SLOT(slotSheetRemove()));
  dataSort=new QAction(tr("Sort Data"), tr("&Sort"), 0, this);
  connect(dataSort, SIGNAL(activated()), this, SLOT(slotDataSort()));
  dataFindReplace=new QAction(tr("Find && Replace"), tr("&Find && Replace"), 0, this);
  connect(dataFindReplace, SIGNAL(activated()), this, SLOT(slotDataFindReplace()));
  funcEqual=new QAction(tr("Equal To"), QPixmap(func_equal_xpm), tr("&Equal To"), 0, this);
  funcEqual->setToolTip("=");
  connect(funcEqual, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
  funcPlus=new QAction(tr("Addition"), QPixmap(func_plus_xpm), tr("&Addition"), 0, this);
  funcPlus->setToolTip("+");
  connect(funcPlus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
  funcMinus=new QAction(tr("Subtraction"), QPixmap(func_minus_xpm), tr("&Subtraction"), 0, this);
  funcMinus->setToolTip("-");
  connect(funcMinus, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
  funcCross=new QAction(tr("Multiplication"), QPixmap(func_cross_xpm), tr("&Multiplication"), 0, this);
  funcCross->setToolTip("*");
  connect(funcCross, SIGNAL(activated()), this, SLOT(slotFuncOutput()));
  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);
  editCopy->addTo(menuEdit);
  editPaste->addTo(menuEdit);
  editPasteContents->addTo(menuEdit);
  editClear->addTo(menuEdit);
  menu->insertItem(tr("&Edit"), menuEdit);
  menuInsert=new QPopupMenu;
  menu->insertItem(tr("&Insert"), menuInsert);
  menuFormat=new QPopupMenu;
  formatCells->addTo(menuFormat);
  menu->insertItem(tr("&Format"), menuFormat);
  menuData=new QPopupMenu;
  dataSort->addTo(menuData);
  dataFindReplace->addTo(menuData);
  menu->insertItem(tr("&Data"), menuData);
 //  menuHelp=new QPopupMenu;
 // helpGeneral->addTo(menuHelp);
 //  helpAbout->addTo(menuHelp);
 //  menu->insertItem(tr("&Help"), menuHelp);
  submenuRow=new QPopupMenu;
  rowHeight->addTo(submenuRow);
  rowAdjust->addTo(submenuRow);
  rowShow->addTo(submenuRow);
  rowHide->addTo(submenuRow);
  menuFormat->insertItem(tr("&Row"), submenuRow);
  submenuCol=new QPopupMenu;
  colWidth->addTo(submenuCol);
  colAdjust->addTo(submenuCol);
  colShow->addTo(submenuCol);
  colHide->addTo(submenuCol);
  menuFormat->insertItem(tr("Colum&n"), submenuCol);
  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);
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
@@ -1,133 +1,133 @@
 /***************************************************************************
 *                                                                         *
 *   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 <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;
  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();
    void slotEditPaste();
    void slotEditPasteContents();
    void slotFormatCells();
    void slotInsertCells();
    void slotInsertRows();
    void slotInsertCols();
    void slotInsertSheets();
    void slotDataSort();
    void slotDataFindReplace();
    void slotRowHeight();
    void slotRowAdjust();
    void slotRowShow();
    void slotRowHide();
    void slotColumnWidth();
    void slotColumnAdjust();
    void slotColumnShow();
    void slotColumnHide();
    void slotSheetRename();
    void slotSheetRemove();
    void slotFuncOutput();
    void slotCellSelect(bool lock);
    void slotCellClicked(const QString &cell);
    void slotSheetChanged(const QString &name);
    void slotDocModified();
    void selectorShow();
    void selectorHide();
    void selectorFileNew(const DocLnk &lnkDoc);
    void selectorFileOpen(const DocLnk &lnkDoc);
  public:
      static QString appName() { return QString::fromLatin1("sheetqt"); }
    MainWindow(QWidget *p, const char*, WFlags);
    ~MainWindow();
    void setHelpFile(const QString &help_filename)          { helpFile=help_filename; }
  public slots:
    void setDocument(const QString &applnk_filename);
 };
 #endif
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
@@ -1,132 +1,132 @@
 #include <qmessagebox.h>
 #include <qheader.h>
 #include <qfont.h>
 #include <sqlite.h>
 #include "budgetdisplay.h"
 #include "budget.h"
 #include "newaccount.h"
 #include "datepicker.h"
 #include "preferences.h"
 #include "transaction.h"
 extern Preferences *preferences;
 extern Budget *budget;
 extern Transaction *transaction;
 BudgetDisplay::BudgetDisplay ( QWidget *parent ) : QWidget ( parent )
  {
    QFont font = this->font();
    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 );
    connect ( budgetbox, SIGNAL ( activated ( int ) ), this, SLOT ( setCurrentBudget ( int ) ) );
    budgetview = new QComboBox ( firstline );
    budgetview->insertItem ( "Month" );
    budgetview->insertItem ( "Year" );
    connect ( budgetview, SIGNAL ( activated ( int ) ), this, SLOT ( setCurrentView ( int ) ) );
    budgeted = new QLabel ( secondline );
    budgeted->setFont ( font );
    actual = new QLabel ( secondline );
    actual->setFont ( font );
    date = new QLabel ( secondline );
    date->setFont ( font );
    listview = new QListView ( this );
    listview->setAllColumnsShowFocus ( TRUE );
    listview->setShowSortIndicator ( TRUE );
    listview->setRootIsDecorated ( TRUE );
    listview->setMultiSelection ( FALSE );
    listview->addColumn ( "Line Item", preferences->getColumnPreference ( 13 ) ); // column id 13
    listview->addColumn ( "Budget", preferences->getColumnPreference ( 14 ) ); // column id 14
    listview->addColumn ( "Actual", preferences->getColumnPreference ( 15 ) ); // column id 15
    listview->addColumn ( "", 0 ); // line item ids
    listview->setColumnWidthMode ( 0, QListView::Manual );
    listview->setColumnWidthMode ( 1, QListView::Manual );
    listview->setColumnWidthMode ( 2, QListView::Manual );
    listview->setColumnAlignment ( 1, Qt::AlignRight );
    listview->setColumnAlignment ( 2, Qt::AlignRight );
    listview->setColumnWidthMode ( 3, QListView::Manual );
    listview->header()->setTracking ( FALSE );
    connect ( listview->header(), SIGNAL ( sizeChange ( int, int, int ) ), this, SLOT ( saveColumnSize ( int, int, int ) ) );
    connect ( listview->header(), SIGNAL ( clicked ( int ) ), this, SLOT ( saveSortingPreference ( int ) ) );
    // pull the column sorting preference from the preferences table, and configure the listview accordingly
    int column = 0;
    int direction = 0;
    preferences->getSortingPreference ( 3, &column, &direction );
    listview->setSorting ( column, direction );
    displayBudgetNames();
    layout = new QVBoxLayout ( this, 2, 2 );
    layout->setMenuBar ( menu );
    layout->addWidget ( firstline );
    layout->addWidget ( secondline );
    layout->addWidget ( listview );
  }
 void BudgetDisplay::deleteBudget ()
  {
    listview->clear();
    transaction->clearBudgetIDs ( currentbudget );
    budget->deleteBudget ( currentbudget );
    if ( budgetbox->count() != 0 )
      displayBudgetNames();
    checkBudgets();
  }
 void BudgetDisplay::saveColumnSize ( int column, int oldsize, int newsize )
  {
    switch ( column )
      {
        case 0:
          preferences->changeColumnPreference ( 13, newsize );
          break;
        case 1:
          preferences->changeColumnPreference ( 14, newsize );
          break;
        case 2:
          preferences->changeColumnPreference ( 15, newsize );
          break;
      }
  }
 void BudgetDisplay::saveSortingPreference ( int column )
  {
    preferences->changeSortingPreference ( 3, column );
  }
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,86 +1,86 @@
 #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;
      QLineEdit *lineitemamount;
      QComboBox *lineitemtime;
      QListView *listview;
      QComboBox *budgetbox;
      QComboBox *budgetview;
      QBoxLayout *layout;
      int getIDColumn ();
    public slots:
      void displayBudgetNames ();
      void displayLineItems ();
      void updateBudgetInformation ();
    private slots:
      void saveColumnSize ( int column, int oldsize, int newsize );
      void newBudget ();
      void deleteBudget ();
      void setCurrentBudget ( int );
      void setCurrentView ( int );
      void showCalendar ();
      void newLineItem ();
      void deleteLineItem ();
      void checkBudgets ();
      void editBudget ();
      void editLineItem ();
      void constructBudgetWindow ();
      void constructLineItemWindow ();
      void saveSortingPreference ( int column );
    private:
      QStringList *names;
      QStringList *ids;
      int currentbudget, year, month, day;
      QDate newDate;
      QString totalbudget, totalactual;
      QString datelabel;
      QDialog *nb;
      QDialog *newlineitem;
 };
 #endif // BUDGETDISPLAY_H
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
@@ -1,122 +1,122 @@
 #include "qashmoney.h"
 #include "preferencedialogs.h"
 #include "memorydialog.h"
 #include <qheader.h>
 #include <iostream.h>
 Budget *budget = new Budget ();
 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" );
    maintabs->addTab ( tab_2, "Transactions" );
    maintabs->addTab ( tab_3, "Budgets" );
    tabheight = tab->height();
    maintabs->setTabEnabled ( tab_2, FALSE );
    // create a new account display object
    accountdisplay = new AccountDisplay ( maintabs );
    accountdisplay->setTabs ( tab_2, maintabs );
    connect ( accountdisplay->listview, SIGNAL ( selectionChanged () ), this, SLOT ( setTransactionTab () ) );
    // set the connection to disable the one touch account viewing if we are transfering money
    connect ( accountdisplay->transferbutton, SIGNAL ( toggled ( bool ) ), this, SLOT ( toggleOneTouchViewing ( bool ) ) );
    // create a new transactiondisplay object
    transactiondisplay = new TransactionDisplay ( maintabs );
    transactiondisplay->hide();
    // create new budgetdisplay object
    budgetdisplay = new BudgetDisplay ( maintabs );
    budgetdisplay->hide();
    tabslayout = new QVBoxLayout ( maintabs, 4, 2 );
    tabslayout->addSpacing ( tabheight );
    tabslayout->addWidget ( accountdisplay );
    tabslayout->addWidget ( transactiondisplay );
    tabslayout->addWidget ( budgetdisplay );
    // connect a change in the maintabs with changing the tab display
    connect ( maintabs, SIGNAL ( currentChanged ( QWidget * ) ), this, SLOT ( changeTabDisplay () ) );
    // create layout that will contain the menubar and the maintabs
    layout = new QVBoxLayout ( this, 2, 2 );
    layout->setMenuBar ( mainmenu );
    layout->addWidget ( maintabs );
  }
 QashMoney::~QashMoney ()
  {
    delete budget;
    delete preferences;
    delete account;
    delete transaction;
    delete transfer;
    delete memory;
  }
 void QashMoney::changeTabDisplay ()
  {
    // if the user pressed the transactions tab, hide the account display
    // object and create a new transaction display
    if ( maintabs->currentPageIndex() == 1 )
      {
        // initialize variables
        bool children = FALSE;
        // hide the account display and define accountid
        int accountid = accountdisplay->listview->selectedItem()->text ( accountdisplay->getIDColumn() ).toInt();
        //remove all the columns from the transactiondisplay
        int columns = transactiondisplay->listview->columns();
        int counter;
        for ( counter = 0; counter <= columns; counter++ )
          transactiondisplay->listview->removeColumn ( 0 );
        // set the account name and account balance
        QString name = account->getAccountName ( accountid );
        QString balance = account->getAccountBalance ( accountid );
        transactiondisplay->name->setText ( name );
        transactiondisplay->balance->setText ( balance );
        // clear the limitbox
        transactiondisplay->limitbox->clear();
        // get parent account id
        int parentaccountid = account->getParentAccountID ( accountid );
        // add columns based on which account is selected
        // this first if determines if we selected a parent with no children or a child
        // in these cases, we add standard three columns for date, transaction, amount
        transactiondisplay->listview->addColumn ( "Date", 0 );
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,64 +1,64 @@
 #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 );
      void setTransactionDisplayDate ();
    private:
      QVBoxLayout *layout;
      QVBoxLayout *tabslayout;
      AccountDisplay *accountdisplay;
      TransactionDisplay *transactiondisplay;
      BudgetDisplay *budgetdisplay;
      int tabheight;
      QDate newdate;
  };
 #endif
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
@@ -1,165 +1,165 @@
 /**********************************************************************
 ** 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 <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 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);
    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");
    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);
    fileSelector = new FileSelector("text/csv;text/x-xml-tableviewer", 
                this, "fileselector");
    fileSelector->setNewVisible(FALSE);
    fileSelector->setCloseVisible(FALSE);
    cw = new QWidgetStack(this, 0);
    cw->addWidget(listView, ListState);
    cw->addWidget(browseView, BrowseState);
    cw->addWidget(filterView, FilterState);
    cw->addWidget(fileSelector, FileState);
    current_view = FileState;
    cw->raiseWidget(current_view);
    fileSelector->reread();
    connect(browseView, SIGNAL(searchOnKey(int, TVVariant)), 
            this, SLOT(searchOnKey(int, TVVariant)));
    connect(browseView, SIGNAL(sortChanged(int)), 
            this, SLOT(setPrimaryKey(int)));
    connect(fileSelector, SIGNAL(closeMe()), this, SLOT(browseViewSlot()));
    connect(fileSelector, SIGNAL(fileSelected(const DocLnk &)), 
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
@@ -9,193 +9,193 @@
 #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 <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);
    
    //get the AI settings
    AISettings ai;
    conf.setGroup("ai");
    ai.rescue=conf.readNumEntry("rescue",6);
    ai.eliminate=conf.readNumEntry("eliminate",4);
    ai.expose=conf.readNumEntry("expose",1);
    ai.protect=conf.readNumEntry("protect",5);
    ai.safe=conf.readNumEntry("safe",3);
    ai.empty=conf.readNumEntry("empty",2);
    move->setAISettings(ai);
    //get the theme component names
    Config theme(theme_file,Config::File);   
    if(!theme.isValid())
    {
      qDebug("theme file does not exist");
      theme.setGroup("theme");
      theme.writeEntry("board","casino_board_1");
      theme.writeEntry("pieces1","casino_pieces_blue");
      theme.writeEntry("pieces2","casino_pieces_white");
      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();
    thememenu->insertItem(tr( "Default"),this,SLOT(themedefault()));
    thememenu->insertItem(tr( "Delete" ),this,SLOT(deletetheme()));
    menuBar->insertItem(tr( "Theme" ),thememenu);
    QPopupMenu* optionmenu=new QPopupMenu(this);
    optionmenu->insertItem(tr( "Player" ),this,SLOT(playerselect()));
    optionmenu->insertSeparator();
    optionmenu->insertItem(tr( "AI" ),this,SLOT(modify_AI()));
    optionmenu->insertItem(tr( "Rules" ),this,SLOT(setrules()));
    menuBar->insertItem(tr( "Options"),optionmenu);
        QWidget* mainarea=new QWidget(this);
        setCentralWidget(mainarea);
    //the main area
        QBoxLayout* layout=new QBoxLayout(mainarea,QBoxLayout::TopToBottom);
    area=new QCanvas(235,235);
    boardview=new BackGammonView(area,mainarea);
    boardview->setMaximumHeight(240);
        layout->addWidget(boardview);
    connect(boardview,SIGNAL(mouse(int,int)),this,SLOT(mouse(int,int)));
    //status bar
    message=new QLabel("<b>Backgammon</b>",mainarea);
    message->setAlignment(AlignHCenter);
    layout->addWidget(message);
    //the marker
    marker_current=new QCanvasRectangle(area);
    marker_current->setBrush(QColor(0,0,255));
    marker_current->setSize(15,5);
    marker_current->setZ(1);
    for(a=0;a<4;a++)
    {
        marker_next[a]=new QCanvasRectangle(area);
        marker_next[a]->setBrush(QColor(0,255,0));
        marker_next[a]->setSize(15,5);
        marker_next[a]->setZ(1);
    }
    connect(move,SIGNAL(done_dice1()),this,SLOT(done_dice1()));
    connect(move,SIGNAL(done_dice2()),this,SLOT(done_dice2()));
    connect(move,SIGNAL(done_dice3()),this,SLOT(done_dice3()));
    connect(move,SIGNAL(done_dice4()),this,SLOT(done_dice4()));
    connect(move,SIGNAL(nomove()),this,SLOT(nomove()));
    connect(move,SIGNAL(player_finished(int)),this,SLOT(finished(int)));
    //the pieces
    p1=new CanvasImageItem*[15];
    p1_side=new CanvasImageItem*[15];
    QImage piece_1_all(Resource::loadImage("backgammon/pieces/"+piecesA_name));
    QImage piece_1_front=piece_1_all.copy(0,0,15,15);
    QImage piece_1_side=piece_1_all.copy(0,15,15,5);
    p2=new CanvasImageItem*[15];
    p2_side=new CanvasImageItem*[15];
    QImage piece_2_all(Resource::loadImage("backgammon/pieces/"+piecesB_name));
    QImage piece_2_front=piece_2_all.copy(0,0,15,15);
    QImage piece_2_side=piece_2_all.copy(0,15,15,5);
    for(a=0;a<15;a++)
    {
        p1[a]=new CanvasImageItem(piece_1_front,area);
        p1[a]->setSize(15,15);
        p1_side[a]=new CanvasImageItem(piece_1_side,area);
        p1_side[a]->setSize(15,5);
        p2[a]=new CanvasImageItem(piece_2_front,area);
        p2[a]->setSize(15,15);
        p2_side[a]=new CanvasImageItem(piece_2_side,area);
        p2_side[a]->setSize(15,5);
    }
    draw();
    //the dice
    QImage dicebgA_all(Resource::loadImage("backgammon/dice/"+diceA_name));
    diceA1=new CanvasImageItem*[7];
    diceA2=new CanvasImageItem*[7];
    QImage dicebgB_all(Resource::loadImage("backgammon/dice/"+diceB_name));
    diceB1=new CanvasImageItem*[7];
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
@@ -1,151 +1,151 @@
 /**********************************************************************
 ** 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 <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);
  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 );
  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);
 }
 PiecesTable::~PiecesTable()
 {
  writeConfig();
 }
 void PiecesTable::writeConfig()
 {
  Config cfg("Fifteen");
  cfg.setGroup("Game");
  QStringList map;
  for (unsigned int i = 0; i < 16; i++)
    map.append( QString::number( _map[i] ) );
  cfg.writeEntry("Map", map, '-');
  cfg.writeEntry("Randomized", _randomized );
 }
 void PiecesTable::readConfig()
 {
  Config cfg("Fifteen");
  cfg.setGroup("Game");
  QStringList map = cfg.readListEntry("Map", '-');
  _randomized = cfg.readBoolEntry( "Randomized", FALSE );
  unsigned int i = 0;
  for ( QStringList::Iterator it = map.begin(); it != map.end(); ++it ) {
    _map[i] = (*it).toInt();
    i++;
    if ( i > 15 ) break;
  }
 }
 void PiecesTable::paintCell(QPainter *p, int row, int col)
 {
  int w = cellWidth();
  int h = cellHeight();
  int x2 = w - 1;
  int y2 = h - 1;
  int number = _map[col + row * numCols()] + 1;
  // draw cell background
  if(number == 16)
    p->setBrush(colorGroup().background());
  else
    p->setBrush(_colors[number-1]);
  p->setPen(NoPen);
  p->drawRect(0, 0, w, h);
  // draw borders
  if (height() > 40) {
    p->setPen(colorGroup().text());
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
@@ -1,161 +1,161 @@
 /**********************************************************************
 ** 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 <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->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 );
    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...
    /*
    if ( width() > height() )
        moveToolBar( toolbar, Left );
    else
        moveToolBar( toolbar, Top );
    */
 }
 GoWidget *GoWidget::self = 0;
 GoWidget::GoWidget( QWidget *parent, const char* name) :
        QWidget( parent, name )
 {
    if ( self )
        fatal( "Only one Go widget allowed" );
    self = this;
    twoplayer = FALSE;
    d = bx = by = 1;
    QPixmap pix = Resource::loadPixmap( "go/pine" );
    goBrush = new QBrush( black, pix );
    /*
    QString fn = Resource::findPixmap("Go-black");
    blackStone = new QImage( fn );
    fn = Resource::findPixmap("Go-black-highlight");
    newBlackStone = new QImage( fn );
    fn = Resource::findPixmap("Go-white");
    whiteStone = new QImage( fn );
    */
    blackStone = new QPixmap(Resource::loadPixmap( "Go-black" ));
    whiteStone = new QPixmap(Resource::loadPixmap( "Go-white" ));
    newBlackStone = new QPixmap(Resource::loadPixmap( "Go-black-highlight" ));
    init();
 }
 GoWidget::~GoWidget()
 {
    writeConfig();
 }
 void GoWidget::writeConfig()
 {
    Config cfg("Go");
    cfg.setGroup("Game");
    cfg.writeEntry("TwoPlayer", twoplayer);
    cfg.writeEntry("CurrentPlayer", currentPlayer);
    cfg.writeEntry("NPassed", nPassed);
    QString b;
    for (int i=0; i<19; i++)
        for (int j=0; j<19; j++)
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
@@ -153,193 +153,193 @@ static const char * dead_xpm[] = {
 "                    "};
 class ResultIndicator : private QLabel
 {
 public:   
    static void showResult( QWidget *ref, bool won );
 private:    
    ResultIndicator( QWidget *parent, const char *name, WFlags f)
        :QLabel( parent, name, f ) {}
    
    void timerEvent( QTimerEvent *);
    void center();
    bool twoStage;
    int timerId;
 };
 void ResultIndicator::showResult( QWidget *ref, bool won )
 {
    ResultIndicator *r = new ResultIndicator( ref, 0, WStyle_Customize | WStyle_Tool | WType_TopLevel );
                                
    r->setAlignment( AlignCenter );
    r->setFrameStyle( Sunken|StyledPanel );
    if ( won ) {
        r->setText( MineSweep::tr("You won!") );
        r->center();
        r->show();
        r->twoStage = FALSE;
        r->timerId = r->startTimer(1500);
    } else {
        QPalette p( red );
        r->setPalette( p );
        r->setText( MineSweep::tr("You exploded!") );
        r->resize( ref->size() );
        r->move( ref->mapToGlobal(QPoint(0,0)) );
        r->show();
        r->twoStage = TRUE;
        r->timerId =r->startTimer(200);
    }
 }
 void ResultIndicator::center()
 {
    QWidget *w = parentWidget();
    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 );
    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 );
    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();
    fnt.setBold( TRUE );
    field->setFont( QFont( fnt ) );
    field->setFocus();
    setCentralWidget( mainframe );
    
    connect( field, SIGNAL( gameOver( bool ) ), this, SLOT( gameOver( bool ) ) );
    connect( field, SIGNAL( mineCount( int ) ), this, SLOT( setCounter( int ) ) );
    connect( field, SIGNAL( gameStarted()), this, SLOT( startPlaying() ) );
    timer = new QTimer( this );
    connect( timer, SIGNAL( timeout() ), this, SLOT( updateTime() ) );
    readConfig();
 }
 MineSweep::~MineSweep()
 {
    writeConfig();
 }
 void MineSweep::gameOver( bool won )
 {
    field->showMines();
    if ( won ) {
        newGameButton->setPixmap( QPixmap( happy_xpm ) );
    } else {
        newGameButton->setPixmap( QPixmap( dead_xpm ) );
    }
    ResultIndicator::showResult( this, won );
    timer->stop();
 }
 void MineSweep::newGame()
 {
    newGame(field->level());
 }
 void MineSweep::newGame(int level)
 {
    timeLCD->display( "0:00" );
    field->setup( level );
    newGameButton->setPixmap( QPixmap( pix_new ) );
    timer->stop();
 }
 void MineSweep::startPlaying()
 {
    newGameButton->setPixmap( QPixmap( worried_xpm ) );
    starttime = QDateTime::currentDateTime();
    timer->start( 1000 );
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
@@ -1,97 +1,97 @@
 /**********************************************************************
 ** 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 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),
        moving(NULL),
        alphaCardPile( NULL ), 
        cardXOff(0), cardYOff(0),
        snapOn(snap),
        numberToDraw(1) { }
    virtual ~CanvasCardGame();
    virtual Card *newCard( eValue v, eSuit s, bool f ) {
        return new CanvasCard( v, s, f, canvas() );
    }
    virtual void readConfig( Config& cfg ) { Q_UNUSED( cfg ); }
    virtual void writeConfig( Config& cfg ) { Q_UNUSED( cfg ); }
    virtual void gameWon();
    virtual bool haveWeWon() { return FALSE; }
    virtual bool mousePressCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); return FALSE; }  
    virtual void mouseReleaseCard(Card *card, QPoint p) { Q_UNUSED(card); Q_UNUSED(p); }
    void cancelMoving() { moving = NULL; }
    void toggleSnap() { snapOn = (snapOn == TRUE) ? FALSE : TRUE; }
    void toggleCardsDrawn() { numberToDraw = (numberToDraw == 1) ? 3 : 1; }
    int cardsDrawn() { return numberToDraw; }
    void setNumberToDraw(int numToDraw) { this->numberToDraw = numToDraw; }
    void readPile( Config& cfg, CardPile *pile, QString name, int& highestZ );
 protected:
    void contentsMousePressEvent(QMouseEvent *e);
    void contentsMouseReleaseEvent(QMouseEvent *e);
    void contentsMouseMoveEvent(QMouseEvent *e);
                virtualvoid checkUnusable() { }  //added for freecell
 protected:
    // Mouse event state variables
    bool moved;
    CanvasCard *moving;
    CanvasCardPile *alphaCardPile;
    int cardXOff, cardYOff;
 private:
    bool snapOn;
    int numberToDraw;
 };
 #endif
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
@@ -1,156 +1,156 @@
 /**********************************************************************
 ** 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 "canvascardwindow.h"
 #include "patiencecardgame.h"
 #include "freecellcardgame.h"
 #include "chicanecardgame.h"
 #include "harpcardgame.h"
 #include "teeclubcardgame.h"
 #include <qpe/resource.h>
 #include <qmainwindow.h>
 #include <qpopupmenu.h>
 #include <qstyle.h>
 CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) :
    QMainWindow(parent, name, f), canvas(230, 260), snapOn(TRUE), cardBack(4), gameType(0),
    cardGame(NULL)
 {
    setIcon( Resource::loadPixmap( "cards" ) );
    // Create Playing Area for Games
    if ( QPixmap::defaultDepth() < 12 ) {
 //      canvas.setBackgroundColor(QColor(0x51, 0x74, 0x6B));
 //  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);
    menu->insertSeparator();
    QPopupMenu* help = new QPopupMenu;
    help->insertItem(tr("&About"), this, SLOT(help()), Key_F1);
    help->setItemChecked(dbf_id, TRUE);
    menu->insertItem(tr("&Help"),help);
 #else
    QMenuBar* menu = menuBar();
    QPopupMenu* file = new QPopupMenu;
    file->insertItem(tr("Patience"), this, SLOT(initPatience()));
    file->insertItem(tr("Freecell"), this, SLOT(initFreecell()));
    file->insertItem(tr("Chicane"), this, SLOT(initChicane()));
    file->insertItem(tr("Harp"), this, SLOT(initHarp()));
    file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub()));
    menu->insertItem(tr("Play"), file);
    
    menu->insertSeparator();
    settings = new QPopupMenu;
    settings->setCheckable(TRUE);
    settings->insertItem(tr("Change card backs"), this, SLOT(changeCardBacks()));
    snap_id = settings->insertItem(tr("Snap to position"), this, SLOT(snapToggle()));
    QString m;
    drawId = settings->insertItem(tr("Turn one card"), this, SLOT(drawnToggle()));
    menu->insertItem(tr("Settings"),settings);
    settings->setCheckable(TRUE);
 #endif
    menu->show();
    Config cfg( "Patience" );
    cfg.setGroup( "GlobalSettings" );
    snapOn = cfg.readBoolEntry( "SnapOn", TRUE);
    settings->setItemChecked(snap_id, snapOn);
    gameType = cfg.readNumEntry( "GameType", -1 );
    drawThree = cfg.readBoolEntry( "DrawThree", FALSE);
    if ( gameType == 0 ) {
  cardGame = new PatienceCardGame( &canvas, snapOn, this );
  cardGame->setNumberToDraw(drawThree ? 3 : 1);
  
  setCaption(tr("Patience"));
  setCentralWidget(cardGame);
  cardGame->readConfig( cfg );
  setCardBacks();
    } else if ( gameType == 1 ) {
  cardGame = new FreecellCardGame( &canvas, snapOn, this );
  setCaption(tr("Freecell"));
  setCentralWidget(cardGame);
  //cardGame->newGame(); // Until we know how to handle reading freecell config
  cardGame->readConfig( cfg );
  setCardBacks();
    } else if ( gameType == 2 ) {
  cardGame = new ChicaneCardGame( &canvas, snapOn, this );
  cardGame->setNumberToDraw(1);
  setCaption(tr("Chicane"));
  setCentralWidget(cardGame);
  cardGame->readConfig( cfg );
  setCardBacks();
    } else if ( gameType == 3 ) {
  cardGame = new HarpCardGame( &canvas, snapOn, this );
  cardGame->setNumberToDraw(1);
  setCaption(tr("Harp"));
  setCentralWidget(cardGame);
  cardGame->readConfig( cfg );
  setCardBacks();
    } else if ( gameType == 4 ) {
  cardGame = new TeeclubCardGame( &canvas, snapOn, this );
  cardGame->setNumberToDraw(1);
  setCaption(tr("Teeclub"));
  setCentralWidget(cardGame);
  cardGame->readConfig( cfg );
  setCardBacks();
    } else {
  // Probably there isn't a config file or it is broken
  // Start a new game
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
@@ -1,164 +1,164 @@
 /***************************************************************************
 *                                                                         *
 *   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 <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);
-    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);
    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);
    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);
    emptyToolBar->setHorizontalStretchable(true);
    // init navigation toolbar
    QPEToolBar* navigationToolBar = new QPEToolBar(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);
    m_pLineToolButton = new QToolButton(drawModeToolBar);
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
@@ -138,193 +138,193 @@ InfoDialog::InfoDialog(const QString &caption, const QStringList text,QWidget *p
            gl->addMultiCellWidget(frm,i,i,0,1);
        }
        else
        {
            l=new QLabel( tr(  labels[count]  )+":",this);
            gl->addWidget(l,i,0,AlignLeft);
            l=new QLabel(text[count],this);
            gl->addWidget(l,i,1,AlignRight);
            count++;
        }
    }
 }
 void InfoDialog::displayInfo(const QString &caption, const QStringList text, QWidget *parent)
 {
    InfoDialog *dlg=new InfoDialog(caption,text,parent);
    dlg->exec();
    delete dlg;
 }
 //===========================================================================
 ImagePane::ImagePane( QWidget *parent ) : QWidget( parent )
 {
    vb = new QVBoxLayout( this );
    image = new QScrollView(this,0,WResizeNoErase|WNorthWestGravity);
    pic=new ImageWidget(image);
    image->addChild(pic);
    connect(pic, SIGNAL( clicked() ), this, SLOT( imageClicked() ));
    vb->addWidget( image );
 }
 void ImagePane::setPixmap( const QPixmap &pm )
 {
    pic->setPixmap( pm );
    pic->resize(pm.width(),pm.height());
    image->updateScrollBars ();
    pic->repaint(false);
 }
 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->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 );
    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);
    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 );
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
@@ -1,134 +1,134 @@
 /**********************************************************************
 ** 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 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 )
        : 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:
    InfoDialog(const QString &caption,const QStringList text,   QWidget *parent);
 };  
 class ControlsDialog:public QDialog
 {
    Q_OBJECT
 public:
    ControlsDialog(const QString &caption,const QImage image,int *brightness,    QWidget *parent);
 private slots:
    void bValueChanged(int);
    void accept();
 private:
    ImageWidget *pixmap;
    QSpinBox *spb;
    QImage  img;
    int *b;
 }; 
 class ImagePane : public QWidget
 {
    Q_OBJECT
 public:
    ImagePane( QWidget *parent=0 );
    ~ImagePane() { }
    //void showStatus();
    //void hideStatus();
    //QLabel  *statusLabel()
    //{
    //    return status;
    //}
    void setPixmap( const QPixmap &pm );
    int  paneWidth() const {
        return image->visibleWidth(); 
    }
    int  paneHeight() const {
        return image->visibleHeight(); 
    }
@@ -157,133 +157,133 @@ private slots:
 class ImageViewer : public QMainWindow
 {
    Q_OBJECT
 public:
    static QString appName() { return QString::fromLatin1("showimg"); }
    ImageViewer( QWidget *parent=0, const char *name=0, int wFlags=0 );
    ~ImageViewer();
    void loadImage( const char *fileName );
    void show(const QString& fileref);
    void show();
    enum INFO_STRINGS {
        PATH,
        FORMAT,
        FILE_SIZE,
        SIZE,
        COLORS,
        ALPHA,
        LAST
    };
    enum RotateDirection   {
        Rotate90, Rotate180, Rotate270
    };
    static QImage  rotate(QImage &img, RotateDirection r);
    static QImage& intensity(QImage &image, float percent);
    static QImage& toGray(QImage &image, bool fast = false);
    bool showThumbView;              // a flag to indicate if FileSelector should be initialized with thumbnail view
 protected:
    void resizeEvent( QResizeEvent * );
    void closeEvent( QCloseEvent * );
 private:
    int  imageIndex(void);
    void updateCaption( QString name );
    bool loadSelected();
    void scale();
    bool reconvertImage();
    int calcHeight();
    void setImage(const QImage& newimage);
    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;
    QPEToolBar  *iconToolBar;
-    QPEMenuBar  *menuBar;
+    QMenuBar  *menuBar;
-    QPEMenuBar  *current;
+    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 ee7d32f..48629bf 100644
--- a/noncore/net/opieftp/opieftp.cpp
+++ b/noncore/net/opieftp/opieftp.cpp
@@ -1,167 +1,167 @@
 /***************************************************************************
   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 <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()) );
-    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);
 //      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);
    cdUpButton = new QToolButton( this,"cdUpButton");
    cdUpButton->setPixmap(Resource::loadPixmap("up"));
    cdUpButton ->setFixedSize( QSize( 20, 20 ) );
    connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
    layout->addMultiCellWidget( cdUpButton, 0, 0, 3, 3 );
    cdUpButton->hide();
 //     docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
 //     docButton->setFixedSize( QSize( 20, 20 ) );
 //     connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
 //     docButton->setFlat(TRUE);
 //     layout->addMultiCellWidget( docButton, 0, 0, 6, 6 );
    homeButton = new QToolButton(this,"homeButton");
    homeButton->setPixmap( Resource::loadPixmap("home"));
    homeButton->setFixedSize( QSize( 20, 20 ) );
    connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
    layout->addMultiCellWidget( homeButton, 0, 0, 4, 4);
     homeButton->hide();
    TabWidget = new QTabWidget( this, "TabWidget" );
    layout->addMultiCellWidget( TabWidget, 1, 1, 0, 4 );
 //     TabWidget->setTabShape(QTabWidget::Triangular);
    tab = new QWidget( TabWidget, "tab" );
    tabLayout = new QGridLayout( tab );
    tabLayout->setSpacing( 2);
    tabLayout->setMargin( 2);
    Local_View = new QListView( tab, "Local_View" );
 //    Local_View->setResizePolicy( QListView::AutoOneFit );
    Local_View->addColumn( tr("File"),150);
    Local_View->addColumn( tr("Date"),-1);
    Local_View->setColumnAlignment(1,QListView::AlignRight);
    Local_View->addColumn( tr("Size"),-1);
    Local_View->setColumnAlignment(2,QListView::AlignRight);
    Local_View->setAllColumnsShowFocus(TRUE);
    Local_View->setMultiSelection( TRUE);
    Local_View->setSelectionMode(QListView::Extended);
    Local_View->setFocusPolicy(QWidget::ClickFocus);
    QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
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
@@ -1,131 +1,131 @@
 /***************************************************************************
   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 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();
    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 & );
    void showLocalMenu( QListViewItem *);
    void showRemoteMenu( QListViewItem *);
    void doLocalCd();
    void doRemoteCd();
    void localUpload();
    void remoteDownload();
    void newConnection();
    void connector();
    void disConnector();
    void populateLocalView();
    bool populateRemoteView();
    void showHidden();
    void writeConfig();
    void readConfig();
    void localListClicked(QListViewItem *);
    void remoteListClicked(QListViewItem *);
    void ListPressed( int, QListViewItem *, const QPoint&, int);
    void RemoteListPressed( int, QListViewItem *, const QPoint&, int);
    void localMakDir();
    void localDelete();
    void remoteMakDir();
    void remoteDelete();
    bool remoteDirList(const QString &);
    bool remoteChDir(const QString &);
    void tabChanged(QWidget*);
    void cleanUp();
    void remoteRename();
    void localRename();
    void currentPathComboChanged();
    void currentPathComboActivated(const QString &);
    void switchToLocalTab();
    void switchToRemoteTab();
    void switchToConfigTab();
    void fillCombos();
    void clearCombos();
    void fillRemoteCombo(const QString&);
    void fillCombo(const QString &);
    void serverComboSelected(int);
    void deleteServer();
    void connectorBtnToggled(bool);
    void NewServer();
    void serverListClicked( const QString &);
    
 protected:
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
@@ -1,93 +1,93 @@
 #include <qpe/qpemenubar.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);
-    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;
 } */
 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);
 }
 void MainWindow::selected(QWidget *) {
    m_tabWidget->setTabColor(m_tabWidget->currentPageIndex(), black);
    emit updateScroll();
 }
 void MainWindow::addTab(IRCTab *tab) {
    connect(tab, SIGNAL(changed(IRCTab *)), this, SLOT(changeEvent(IRCTab *)));
    m_tabWidget->addTab(tab, tab->title());
    m_tabWidget->showPage(tab);
    tab->setID(m_tabWidget->currentPageIndex());
    m_tabs.append(tab);
 }
 void MainWindow::changeEvent(IRCTab *tab) {
    if (tab->id() != m_tabWidget->currentPageIndex())
        m_tabWidget->setTabColor(tab->id(), blue);
 }
 void MainWindow::killTab(IRCTab *tab) {
    m_tabWidget->removePage(tab);
    m_tabs.remove(tab);
    /* there might be nicer ways to do this .. */
    delete tab;
 }
 void MainWindow::newConnection() {
    IRCServerList list(this, "ServerList", TRUE);
    if (list.exec() == QDialog::Accepted && list.hasServer()) {
        IRCServerTab *serverTab = new IRCServerTab(list.server(), this, m_tabWidget);
        addTab(serverTab);
        serverTab->doConnect();
    }
 }
 void MainWindow::settings() {
    IRCSettings settings(this, "Settings", TRUE);
    if (settings.exec() == QDialog::Accepted) {
        QListIterator<IRCTab> it(m_tabs);
        for (; it.current(); ++it) {
            /* Inform all tabs about the new settings */
            it.current()->settingsChanged();
        }
    }
 }
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
@@ -1,136 +1,136 @@
 /**********************************************************************
 ** 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 <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
 //
 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" );
    else if( isLib() )
  pm = Resource::loadPixmap( "library" );
    else if( ((FileView* )parent)->getShowThumbnails() && mt.id().contains(QRegExp("^image/", FALSE, FALSE)) )
      pm = drawThumbnail(fi);
  else
  pm = mt.pixmap();
    if ( pm.isNull() )
  pm = Resource::loadPixmap("UnknownDocument-14");
   if( fi.isSymLink() ){
    // overlay link image
    QPixmap lnk = Resource::loadPixmap( "filebrowser/symlink" );
    QPainter painter( &pm );
    painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
        pm.setMask( pm.createHeuristicMask( FALSE ) );
    }
    setPixmap(0,pm);
 }
 QString FileItem::sizeString( unsigned int s )
 {
    double size = s;
    if ( size > 1024 * 1024 * 1024 )
    return QString().sprintf( "%.1f", size / ( 1024 * 1024 * 1024 ) ) + "G";
    else if ( size > 1024 * 1024 )
    return QString().sprintf( "%.1f", size / ( 1024 * 1024 ) ) + "M";
    else if ( size > 1024 )
    return QString().sprintf( "%.1f", size / ( 1024 ) ) + "K";
    else
    return QString::number( size ) + "B";
 }
 QString FileItem::key( int column, bool ascending ) const
 {
    QString tmp;
    ascending = ascending;
    if( (column == 0) && fileInfo.isDir() ){ // Sort by name
    // We want the directories to appear at the top of the list
    tmp = (char) 0;
    return (tmp + text( column ).lower());
    }
    else if( column == 2 ) { // Sort by date
    QDateTime epoch( QDate( 1980, 1, 1 ) );
        tmp.sprintf( "%08d", epoch.secsTo( fileInfo.lastModified() ) );
    return tmp;
    }
    else if( column == 1 ) { // Sort by size
@@ -749,193 +749,193 @@ void FileView::showFileMenu()
    MimeType mt(i->getFilePath());
    const AppLnk* app = mt.application();
    if ( !i->isDir() ) {
    if ( app )
      m->insertItem( app->pixmap(), tr( "Open in " + app->name() ), this, SLOT( run() ) );
    else if( i->isExecutable() )
      m->insertItem( Resource::loadPixmap( i->text( 0 ) ), tr( "Run" ), this, SLOT( run() ) );
    m->insertItem( Resource::loadPixmap( "txt" ), tr( "View as text" ),
             this, SLOT( viewAsText() ) );
    m->insertSeparator();
    }
    m->insertItem( tr( "Rename" ), this, SLOT( rename() ) );
    m->insertItem( Resource::loadPixmap("cut"),
            tr( "Cut" ), this, SLOT( cut() ) );
    m->insertItem( Resource::loadPixmap("copy"),
           tr( "Copy" ), this, SLOT( copy() ) );
    m->insertItem( Resource::loadPixmap("paste"),
           tr( "Paste" ), this, SLOT( paste() ) );
    m->insertItem( tr( "Change Permissions" ), this, SLOT( chPerm() ) );
    m->insertItem(Resource::loadPixmap( "close" ), tr( "Delete" ), this, SLOT( del() ) );
    m->insertSeparator();
    m->insertItem( tr( "Select all" ), this, SLOT( selectAll() ) );
    m->insertItem( tr( "Deselect all" ), this, SLOT( deselectAll() ) );
    m->popup( QCursor::pos() );
 }
 //
 //  FileBrowser
 //
 void FileView::setShowHidden(bool hidden)
 {
  showHidden=hidden;
 }
 void FileView::setShowSymlinks(bool symlinks)
 {
  showSymlinks=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 );
    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 );
    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 );
    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();
    }
 }
 void FileBrowser::changeCaption(const QString & dir) {
    setCaption( dir);
 }
 void FileBrowser::dirSelected( int id )
 {
    int i = 0, j;
    QString dir;
    // Bulid target dir from menu
    while( (j = dirMenu->idAt( i )) != id ){
    dir += dirMenu->text( j ).stripWhiteSpace();
    if( dirMenu->text( j ) != "/" ) dir += "/";
    i++;
    }
    dir += dirMenu->text( dirMenu->idAt( i ) ).stripWhiteSpace();
    fileView->setDir( dir );
 }
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
@@ -1,121 +1,121 @@
 #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 <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);
        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);
        receiversBox = new QComboBox(main);
        receiversBox->insertItem(tr("To"), POPUP_RECV_TO);
        receiversBox->insertItem(tr("Cc"), POPUP_RECV_CC);
        receiversBox->insertItem(tr("Bcc"), POPUP_RECV_BCC);
        layout->addWidget(receiversBox, 1, 0);
        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);
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,61 +1,61 @@
 #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;
        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;
-         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
@@ -1,75 +1,75 @@
 #include <qpopupmenu.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlabel.h>
 #include <qvbox.h>
 #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);
         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)
 {
        if (folderView->isHidden() && toggled) folderView->show();
        if (!folderView->isHidden() && !toggled) folderView->hide();
 }
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
@@ -1,75 +1,75 @@
 #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 <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);
        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)
 {
        if (state) attachments->show();
        else attachments->hide();
 }
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,182 +1,182 @@
 /***************************************************************************
 *                                                                         *
 *   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>
 #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 );
-  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 );
                
  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 );
         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);
  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() ) );