Namespace changes for Apps

QAshMoney and Reader need to be valgrinded

43 files changed, 90 insertions, 63 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 2ba3dca..a60d6ce 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -28,16 +28,18 @@
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
+using namespace Opie::Ui;
+
 #ifdef NOQUICKLAUNCH
 AdvancedFm::AdvancedFm( )
 #else
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
 #endif
    : QMainWindow( ) {
    init();
    renameBox = 0;
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 547fa7c..4eaa6d6 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -25,17 +25,16 @@
 #include <qmainwindow.h>
 #include <qstringlist.h>
 #include <qdir.h>
 #include <qstring.h>
 #include <qpoint.h>
 #include <qtimer.h>
 #include <qpixmap.h>
 
-using Opie::OSplitter;
 
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QComboBox;
 class QListView;
 class QListviewItem;
 class QLabel;
@@ -91,17 +90,17 @@ protected slots:
    void runCommandStd();
    QStringList getPath();
    void mkSym();
    void switchToLocalTab();
    void switchToRemoteTab();
 
 protected:
 
-   OSplitter *TabWidget;
+   Opie::Ui::OSplitter *TabWidget;
    QCopChannel * channel;
    QPixmap unknownXpm;
    int whichTab;
 //    QTabWidget *TabWidget;
    QWidget *tab, *tab_2, *tab_3;
    QListView *Local_View, *Remote_View;
 
    QLineEdit *currentPathEdit;
@@ -176,17 +175,17 @@ private:
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    void gotoDirectory(const QString &);
    void navigateToSelected();
    void findFile(const QString &);
 
 private slots:
-   void processEnded(OProcess *);
-   void oprocessStderr(OProcess *, char *, int);
+   void processEnded(Opie::Core::OProcess *);
+   void oprocessStderr(Opie::Core::OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
 
 };
 
 #endif // ADVANCEDFM_H
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index f791c77..73ef8f9 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -22,16 +22,17 @@
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 
 #include <sys/utsname.h>
 
 
+using namespace Opie::Ui;
 void AdvancedFm::init() {
 #if defined(QT_QWS_OPIE)
     qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!");
 #endif
     setCaption( tr( "AdvancedFm" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     layout->setSpacing( 2);
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 9e740d0..a694b70 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -27,16 +27,18 @@
 #include <stdlib.h>

 #include <unistd.h>

 #include <sys/stat.h>

 #include <dirent.h>

 #include <sys/sendfile.h>

 #include <fcntl.h>

 

 

+using namespace Opie::Core;
+using namespace Opie::Core;
 void AdvancedFm::doDirChange() {

    QString pathItem = CurrentView()->currentItem()->text(0);

    if( pathItem == "../") {

       ListClicked( CurrentView()->currentItem());

    } else {

       if( pathItem.find(" -> ",0,TRUE) != -1)

          pathItem = dealWithSymName((const QString&)pathItem)+"/";

 //      qWarning(pathItem);

@@ -697,20 +699,20 @@ void AdvancedFm::selectAll() {
   thisView->selectAll(true);

   thisView->setSelected( thisView->firstChild(),false);

 }

 

 void AdvancedFm::startProcess(const QString & cmd) {

   QStringList command;

   OProcess *process;

   process = new OProcess();

-  connect(process, SIGNAL(processExited(OProcess*)),

+  connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),

           this, SLOT( processEnded(OProcess*)));

 

-  connect(process, SIGNAL( receivedStderr(OProcess*,char*,int)),

+  connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),

             this, SLOT( oprocessStderr(OProcess*,char*,int)));

 

   command << "/bin/sh";

   command << "-c";

   command << cmd.latin1();

   *process << command;

   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )

     qDebug("could not start process");

diff --git a/noncore/apps/advancedfm/main.cpp b/noncore/apps/advancedfm/main.cpp
index 3c1a164..df0d4af 100644
--- a/noncore/apps/advancedfm/main.cpp
+++ b/noncore/apps/advancedfm/main.cpp
@@ -1,33 +1,22 @@
 
 /***************************************************************************
+using namespace Opie::Core;
+using namespace Opie::Core;
                           main.cpp  -  description
                              -------------------
     begin                : March 10, 2002
     copyright            : (C) 2002 by llornkcor
     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 "advancedfm.h"
-
-#ifdef NOQUICKLAUNCH
-
-#include <qpe/qpeapplication.h>
-
-int main(int argc, char *argv[])
-{
-    QPEApplication a(argc, argv);
-
-    AdvancedFm advencedFm;
-    a.showMainWidget( &advencedFm);
-    return a.exec();
-}
-#else
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
+
 OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> )
 
-#endif
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 0bba1d8..16a0992 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -11,16 +11,18 @@
 #include <qfile.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
 #include <errno.h>
 
 /* XPM */
+using namespace Opie::Core;
+using namespace Opie::Core;
 static char * filesave_xpm[] = {
 "16 16 78 1",
 "   c None",
 ".  c #343434",
 "+  c #A0A0A0",
 "@  c #565656",
 "#  c #9E9E9E",
 "$  c #525252",
@@ -136,23 +138,23 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
  //    docButton->setFlat(TRUE);
      OutputLayout->addMultiCellWidget( docButton, 0,0,3,3 );
 
     OutputEdit = new QMultiLineEdit( this, "OutputEdit" );
     OutputLayout->addMultiCellWidget( OutputEdit, 1,1,0,3 );
 
     proc = new OProcess();
 
-    connect(proc, SIGNAL(processExited(OProcess*)),
+    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT( processFinished()));
 
-    connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(commandStdout(OProcess*,char*,int)));
 
-    connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT(commandStderr(OProcess*,char*,int)));
 
 //     connect( , SIGNAL(received(const QByteArray&)),
 //             this, SLOT(commandStdin(const QByteArray&)));
 
 //    * proc << commands.latin1();
       for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
          qDebug( "%s", (*it).latin1() );
diff --git a/noncore/apps/advancedfm/output.h b/noncore/apps/advancedfm/output.h
index 26c0fa0..37ba57d 100644
--- a/noncore/apps/advancedfm/output.h
+++ b/noncore/apps/advancedfm/output.h
@@ -30,22 +30,22 @@ class Output : public QDialog
 public:
     Output(const QStringList commands=0, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
     ~Output();
 
     QMultiLineEdit* OutputEdit;
 
 protected:
     QGridLayout* OutputLayout;
-    OProcess *proc;
+    Opie::Core::OProcess *proc;
 protected slots:
     void saveOutput();
-    void commandStdout(OProcess*, char *, int);
+    void commandStdout(Opie::Core::OProcess*, char *, int);
     void commandStdin(const QByteArray &);
-    void commandStderr(OProcess*, char *, int);
+    void commandStderr(Opie::Core::OProcess*, char *, int);
     void processFinished();
   private:
     QString cmmd;
 
 };
 
 class InputDialog : public QDialog
 {
diff --git a/noncore/apps/checkbook/checkbook.cpp b/noncore/apps/checkbook/checkbook.cpp
index 1b933f2..706d970 100644
--- a/noncore/apps/checkbook/checkbook.cpp
+++ b/noncore/apps/checkbook/checkbook.cpp
@@ -53,16 +53,17 @@
 #define COL_SORTDATE    1
 #define COL_NUM         2
 #define COL_DATE        3
 #define COL_DESC        4
 #define COL_AMOUNT      5
 #define COL_BAL         6
 
 // --- Checkbook --------------------------------------------------------------
+using namespace Opie::Ui;
 Checkbook::Checkbook( QWidget *parent, CBInfo *i, Cfg *cfg )
     : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
     info = i;
     _pCfg=cfg;
 
     // Title bar
     if ( info->name() != "" )
diff --git a/noncore/apps/checkbook/checkbook.h b/noncore/apps/checkbook/checkbook.h
index e2f0e56..80bc106 100644
--- a/noncore/apps/checkbook/checkbook.h
+++ b/noncore/apps/checkbook/checkbook.h
@@ -30,17 +30,16 @@
 #define CHECKBOOK_H
 
 #include <opie2/otabwidget.h>
 
 #include <qdatetime.h>
 #include <qdialog.h>
 #include <qlistview.h>
 
-using Opie::OTabWidget;
 
 class CBInfo;
 class Graph;
 class GraphInfo;
 class QCheckBox;
 class QComboBox;
 class QLabel;
 class QLineEdit;
@@ -68,17 +67,17 @@ class Checkbook : public QDialog
         // members
         TranInfoList *getTranList() { return(tranList); }
 
     private:
         CBInfo *info;
         TranInfoList *tranList;
         Cfg *_pCfg;
 
-        OTabWidget *mainWidget;
+        Opie::Ui::OTabWidget *mainWidget;
         void        loadCheckbook();
         void        adjustBalance();
 
         // Info tab
         QWidget        *initInfo();
         QCheckBox      *passwordCB;
         QLineEdit      *nameEdit;
         QComboBox      *typeList;
diff --git a/noncore/apps/checkbook/main.cpp b/noncore/apps/checkbook/main.cpp
index 0384620..1135bee 100644
--- a/noncore/apps/checkbook/main.cpp
+++ b/noncore/apps/checkbook/main.cpp
@@ -23,11 +23,13 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 #include "mainwindow.h"
 
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/checkbook/mainwindow.cpp b/noncore/apps/checkbook/mainwindow.cpp
index 254ce6a..ce15e3e 100644
--- a/noncore/apps/checkbook/mainwindow.cpp
+++ b/noncore/apps/checkbook/mainwindow.cpp
@@ -30,17 +30,17 @@
 #include "cbinfo.h"
 #include "configuration.h"
 #include "password.h"
 #include "checkbook.h"
 
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpemessagebox.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/resource.h>
 
 #include <qmenubar.h>
 #include <qaction.h>
 #include <qdir.h>
 #include <qwhatsthis.h>
 
 
diff --git a/noncore/apps/confedit/main.cpp b/noncore/apps/confedit/main.cpp
index 584e6b2..3a010dd 100644
--- a/noncore/apps/confedit/main.cpp
+++ b/noncore/apps/confedit/main.cpp
@@ -1,5 +1,6 @@
-
 #include "mainwindow.h"
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
+
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/apps/odict/main.cpp b/noncore/apps/odict/main.cpp
index d5b08d3..7729d5f 100644
--- a/noncore/apps/odict/main.cpp
+++ b/noncore/apps/odict/main.cpp
@@ -16,9 +16,11 @@
  **************************************************************************/
 
 
 #include <opie2/oapplicationfactory.h>
 
 #include "odict.h"
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<ODict> )
diff --git a/noncore/apps/odict/searchmethoddlg.cpp b/noncore/apps/odict/searchmethoddlg.cpp
index f71cfd8..34e8b16 100644
--- a/noncore/apps/odict/searchmethoddlg.cpp
+++ b/noncore/apps/odict/searchmethoddlg.cpp
@@ -24,18 +24,17 @@
 
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlineedit.h>
 #include <qdir.h>
 
-using Opie::OFileDialog;
-using Opie::OFileSelector;
+using namespace Opie::Ui;
 
 SearchMethodDlg::SearchMethodDlg(QWidget *parent, const char *name, bool modal, QString itemname) : QDialog(parent, name, modal)
 {
 
 	QVBoxLayout *vbox_layout = new QVBoxLayout( this, 4,4,"vbox_layout" );
 	QVBox *vbox = new QVBox( this );
 
 	QHBox *hbox1 = new QHBox( vbox );
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index b6401ed..e6cb515 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -11,17 +11,17 @@
     ***************************************************************************/
 
 #include "bartender.h"
 #include "showdrinks.h"
 #include "inputDialog.h"
 #include "searchresults.h"
 #include "bac.h"
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 //#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qpushbutton.h>
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 1a8c979..35a328f 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,11 +1,13 @@
 
 #include "io_bt.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
 
 
 IOBt::~IOBt() {
     if ( m_attach ) {
         delete m_attach;
@@ -31,17 +33,17 @@ bool IOBt::open() {
 
         // now it should also be checked, if there is a connection to the device with that mac allready
         // hciattach here
         m_attach = new OProcess();
         *m_attach << "hciattach /dev/ttyS2 any 57600";
 
         // then start hcid, then rcfomm handling (m_mac)
 
-        connect( m_attach, SIGNAL( processExited(OProcess*) ),
+        connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
                  this, SLOT( slotExited(OProcess*) ) );
 
         if ( m_attach->start() ) {
             ret = IOSerial::open();
         } else {
             qWarning("could not attach to device");
             delete m_attach;
             m_attach = 0;
diff --git a/noncore/apps/opie-console/io_bt.h b/noncore/apps/opie-console/io_bt.h
index df6dd38..00ca7e5 100644
--- a/noncore/apps/opie-console/io_bt.h
+++ b/noncore/apps/opie-console/io_bt.h
@@ -36,16 +36,16 @@ signals:
 
 public slots:
     virtual void send( const QByteArray& );
     virtual bool open();
     virtual void close();
     virtual void reload(const Profile &);
 
 private:
-    OProcess *m_attach;
+    Opie::Core::OProcess *m_attach;
     QString m_mac;
 private slots:
-    void slotExited(OProcess* proc);
+    void slotExited(Opie::Core::OProcess* proc);
 
 };
 
 #endif /* OPIE_IO_IRDA */
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index b281b7d..ba0b0e5 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -1,11 +1,13 @@
 
 #include "io_irda.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
 
 
 IOIrda::~IOIrda() {
     if ( m_attach ) {
         delete m_attach;
@@ -22,17 +24,17 @@ void IOIrda::close() {
 
 bool IOIrda::open() {
     bool ret;
 
     // irdaattach here
     m_attach = new OProcess();
     *m_attach << "irattach /dev/ttyS2 -s";
 
-    connect( m_attach, SIGNAL( processExited(OProcess*) ),
+    connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
             this, SLOT( slotExited(OProcess*) ) );
 
     if ( m_attach->start() ) {
         ret= IOSerial::open();
     } else {
     // emit error!!!
         qWarning("could not attach to device");
         delete m_attach;
diff --git a/noncore/apps/opie-console/io_irda.h b/noncore/apps/opie-console/io_irda.h
index 69bed7d..fb29686 100644
--- a/noncore/apps/opie-console/io_irda.h
+++ b/noncore/apps/opie-console/io_irda.h
@@ -34,16 +34,16 @@ signals:
 
 public slots:
     virtual void send( const QByteArray& );
     virtual bool open();
     virtual void close();
     virtual void reload(const Profile &);
 
 private:
-    OProcess *m_attach;
+    Opie::Core::OProcess *m_attach;
 
 private slots:
-    void slotExited(OProcess* proc);
+    void slotExited(Opie::Core::OProcess* proc);
 
 };
 
 #endif /* OPIE_IO_IRDA */
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 1ce680a..b74d076 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -1,13 +1,15 @@
 
 #include "io_modem.h"
 
 #include "dialer.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOModem::IOModem( const Profile &profile )
 	: IOSerial( profile ) {
 	m_profile = profile;
 }
 
 
 IOModem::~IOModem() {
 
diff --git a/noncore/apps/opie-console/io_modem.h b/noncore/apps/opie-console/io_modem.h
index 96ec3ef..5b99e00 100644
--- a/noncore/apps/opie-console/io_modem.h
+++ b/noncore/apps/opie-console/io_modem.h
@@ -62,13 +62,13 @@ private:
 
     QString m_initString, m_resetString, m_dialPref1, m_dialSuf1, m_dialPref2,
         m_dialSuf2, m_dialPref3, m_dialSuf3, m_connect, m_hangup, m_cancel;
     int  m_dialTime, m_delayRedial, m_numberTries, m_dtrDropTime,
         m_bpsDetect, m_dcdLines, m_multiLineUntag;
     Profile m_profile;
 
 private slots:
-    void slotExited(OProcess* proc);
+    void slotExited(Opie::Core::OProcess* proc);
 
 };
 
 #endif
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 197f799..06a8f7d 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -19,16 +19,17 @@
 #include "mainwindow.h"
 #include "tabwidget.h"
 #include "transferdialog.h"
 #include "function_keyboard.h"
 #include "emulation_handler.h"
 #include "script.h"
 
 
+using namespace Opie::Ui;
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp)  {
     KeyTrans::loadAll();
     for (int i = 0; i < KeyTrans::count(); i++ ) {
         KeyTrans* s = KeyTrans::find(i );
         assert( s );
     }
     m_factory = new MetaFactory();
     Default def(m_factory);
@@ -327,17 +328,17 @@ void MainWindow::slotRecordScript() {
 }
 
 void MainWindow::slotSaveScript() {
     if (currentSession() && currentSession()->emulationHandler()->isRecording()) {
         QMap<QString, QStringList> map;
         QStringList text;
         text << "text/plain";
         map.insert(tr("Script"), text );
-        QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+        QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
         if (!filename.isEmpty()) {
             QFileInfo info(filename);
             if (info.extension(FALSE) != "script")
                 filename += ".script";
             DocLnk nf;
             nf.setType("text/plain");
             nf.setFile(filename);
             nf.setName(info.fileName());
@@ -700,17 +701,17 @@ void MainWindow::slotSaveSession() {
     manager()->save();
     populateProfiles();
 }
 void MainWindow::slotSaveHistory() {
     QMap<QString, QStringList> map;
     QStringList text;
     text << "text/plain";
     map.insert(tr("History"), text );
-    QString filename = Opie::OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
+    QString filename = OFileDialog::getSaveFileName(2, QPEApplication::documentDir(), QString::null, map);
     if (filename.isEmpty() ) return;
 
     QFileInfo info(filename);
 
     DocLnk nf;
     nf.setType("text/plain");
     nf.setFile(filename);
     nf.setName(info.fileName());
diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp
index 6e1e23e..dc42d8b 100644
--- a/noncore/apps/opie-console/profileeditordialog.cpp
+++ b/noncore/apps/opie-console/profileeditordialog.cpp
@@ -4,16 +4,17 @@
 #include <qmessagebox.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qscrollview.h>
 
 #include "metafactory.h"
 #include "profileeditordialog.h"
 
+using namespace Opie::Ui;
 namespace {
     void setCurrent( const QString& str, QComboBox* bo ) {
         for (int i = 0; i < bo->count(); i++ ) {
             if ( bo->text(i) == str ) {
                 bo->setCurrentItem( i );
             }
         }
     };
diff --git a/noncore/apps/opie-console/profileeditordialog.h b/noncore/apps/opie-console/profileeditordialog.h
index 97bd650..e7a88e9 100644
--- a/noncore/apps/opie-console/profileeditordialog.h
+++ b/noncore/apps/opie-console/profileeditordialog.h
@@ -48,14 +48,14 @@ private:
     QComboBox *m_conCmb, *m_termCmb;
     QCheckBox *m_autoConnect;
 
     QScrollView *m_svCon, *m_svTerm;
 
     QWidget *m_tabCon, *m_tabTerm, *m_tabKey;
     ProfileDialogWidget* m_con, *m_term, *m_key;
     QHBoxLayout *m_layCon, *m_layTerm, *m_layKey;
-    OTabWidget *tabWidget;
+    Opie::Ui::OTabWidget *tabWidget;
     QWidget *tabprof;
     int m_showconntab;
 };
 
 #endif
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index 2f82417..5958e93 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -1,16 +1,18 @@
 
 #include "sz_transfer.h"
 #include <qfile.h>
 #include <stdio.h>
 #include <sys/termios.h>
 
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t)
 {
 }
 
 SzTransfer::~SzTransfer() {
 }
 
 void SzTransfer::sendFile(const QFile& file) {
@@ -20,21 +22,21 @@ void SzTransfer::sendFile(const QFile& file) {
 
 void SzTransfer::sendFile(const QString& file) {
 
     //setcbreak(2); /* raw no echo */
 
     proc = new OProcess;
     *proc << "sz";
     *proc << "-v" << "-v" << "-b" << file;
-    connect(proc, SIGNAL(processExited(OProcess*)),
+    connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
             this, SLOT(sent()));
-    connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(SzReceivedStdout(OProcess*,char*,int)));
-    connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)),
+    connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT(SzReceivedStderr(OProcess*,char*,int)));
     connect(layer(), SIGNAL(received(const QByteArray&)),
             this, SLOT(receivedStdin(const QByteArray&)));
     proc->start(OProcess::NotifyOnExit, OProcess::All);
 
 }
 
 void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) {
diff --git a/noncore/apps/opie-console/sz_transfer.h b/noncore/apps/opie-console/sz_transfer.h
index aa97c32..0505215 100644
--- a/noncore/apps/opie-console/sz_transfer.h
+++ b/noncore/apps/opie-console/sz_transfer.h
@@ -22,19 +22,19 @@ public slots:
     /**
      * send a file over the layer
      */
     void sendFile( const QString& file ) ;
     void sendFile( const QFile& );
     void sent();
 
 private slots:
-    void SzReceivedStdout(OProcess *, char *, int);
-    void SzReceivedStderr(OProcess *, char *, int);
+    void SzReceivedStdout(Opie::Core::OProcess *, char *, int);
+    void SzReceivedStderr(Opie::Core::OProcess *, char *, int);
     void receivedStdin(const QByteArray &);
 
 private:
-    OProcess *proc;
+    Opie::Core::OProcess *proc;
     Type m_t;
 
 };
 
 #endif
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp
index 419f8ac..6429e3c 100644
--- a/noncore/apps/opie-console/tabwidget.cpp
+++ b/noncore/apps/opie-console/tabwidget.cpp
@@ -1,11 +1,12 @@
 
 #include "tabwidget.h"
 
+using namespace Opie::Ui;
 TabWidget::TabWidget( QWidget* parent, const char* name )
     : OTabWidget( parent, name ) {
     connect(this, SIGNAL( currentChanged(QWidget*) ),
             this, SLOT( slotCurChanged(QWidget*) ) );
 }
 
 TabWidget::~TabWidget() {
 }
diff --git a/noncore/apps/opie-console/tabwidget.h b/noncore/apps/opie-console/tabwidget.h
index 98450a3..0138645 100644
--- a/noncore/apps/opie-console/tabwidget.h
+++ b/noncore/apps/opie-console/tabwidget.h
@@ -4,17 +4,17 @@
 #include <qmap.h>
 #include <opie2/otabwidget.h>
 
 #include "session.h"
 /**
  * This is our central tab widget
  * we can add sessions here
  */
-class TabWidget : public OTabWidget{
+class TabWidget : public Opie::Ui::OTabWidget{
     Q_OBJECT
 public:
     TabWidget(QWidget *parent, const char* name );
     ~TabWidget();
     void add( Session* );
     void remove( Session* );
     void setCurrent( Session* );
 
diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp
index b1725db..df27055 100644
--- a/noncore/apps/opie-console/test/senderui.cpp
+++ b/noncore/apps/opie-console/test/senderui.cpp
@@ -10,16 +10,18 @@
 #include "../io_serial.h"
 #include "../filetransfer.h"
 #include "../filereceive.h"
 
 #include <opie2/oprocess.h>
 
 #include "senderui.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 SenderUI::SenderUI()
     : Sender() {
 
     /* we do that manually */
     Profile prof;
     QString str = "/dev/bty0";
     prof.writeEntry("Device",str );
     prof.writeEntry("Baud", 19200 );
diff --git a/noncore/apps/opie-console/test/senderui.h b/noncore/apps/opie-console/test/senderui.h
index c130dcf..15f0743 100644
--- a/noncore/apps/opie-console/test/senderui.h
+++ b/noncore/apps/opie-console/test/senderui.h
@@ -3,17 +3,17 @@
 
 #include <qcstring.h>
 
 #include "sender.h"
 
 class IOSerial;
 class FileTransfer;
 class QSocketNotifier;
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 class SenderUI : public Sender {
     Q_OBJECT
 public:
     SenderUI();
     ~SenderUI();
 
 public slots:
     void send();
@@ -22,13 +22,13 @@ public slots:
     void slotRev();
     void got(const QByteArray& );
     void fileTransComplete();
 private:
     IOSerial* ser;
     FileTransfer* sz;
     int m_fd;
     QSocketNotifier* m_sock;
-    OProcess* m_proc;
+    Opie::Core::OProcess* m_proc;
 };
 
 
 #endif
diff --git a/noncore/apps/opie-console/transferdialog.cpp b/noncore/apps/opie-console/transferdialog.cpp
index d494a6c..75eb443 100644
--- a/noncore/apps/opie-console/transferdialog.cpp
+++ b/noncore/apps/opie-console/transferdialog.cpp
@@ -10,16 +10,17 @@
 
 #include <opie2/ofiledialog.h>
 
 #include "metafactory.h"
 #include "mainwindow.h"
 
 #include "transferdialog.h"
 
+using namespace Opie::Ui;
 TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *)
 : QDialog(parent, 0l, false), m_win(mainwindow)
 {
     m_lay = 0l;
     m_recvlay = 0l;
     QVBoxLayout *vbox, *vbox2;
     QHBoxLayout *hbox, *hbox2, *hbox3;
     QLabel *file, *mode, *progress, *status;
@@ -93,17 +94,17 @@ TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const ch
 TransferDialog::~TransferDialog()
 {
 }
 
 void TransferDialog::slotFilename()
 {
     QString f;
 
-    f = Opie::OFileDialog::getOpenFileName(0);
+    f = OFileDialog::getOpenFileName(0);
     if(!f.isNull()) filename->setText(f);
 }
 
 void TransferDialog::slotTransfer()
 {
     if((m_transfermode == id_send) && (filename->text().isEmpty()))
     {
         QMessageBox::information(this,
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp
index b0d589e..b072854 100644
--- a/noncore/apps/opie-reader/QTReaderApp.cpp
+++ b/noncore/apps/opie-reader/QTReaderApp.cpp
@@ -18,17 +18,17 @@
 **
 **********************************************************************/
 #include "useqpe.h"
 #include <qregexp.h>
 #include <qclipboard.h>
 #include <qwidgetstack.h>
 #ifdef USEQPE
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #endif
 #include <qmenubar.h>
 #include <qtoolbar.h>
 #ifdef USEQPE
 #include <qpe/menubutton.h>
 #include <qpe/fontdatabase.h>
 #endif
 #include <qcombobox.h>
diff --git a/noncore/apps/opie-sheet/main.cpp b/noncore/apps/opie-sheet/main.cpp
index c7a7d88..861473e 100644
--- a/noncore/apps/opie-sheet/main.cpp
+++ b/noncore/apps/opie-sheet/main.cpp
@@ -7,14 +7,17 @@
  *                                                                         *
  ***************************************************************************/
 
 /*
  * Opie Sheet (formerly Sheet/Qt)
  * by Serdar Ozler <sozler@sitebest.com>
  */
 
+
 #include "mainwindow.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
+
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
 
diff --git a/noncore/apps/opie-write/main.cpp b/noncore/apps/opie-write/main.cpp
index 6a8aaaa..036fe48 100644
--- a/noncore/apps/opie-write/main.cpp
+++ b/noncore/apps/opie-write/main.cpp
@@ -14,15 +14,17 @@
 ** email sales@trolltech.com for information about Qtopia License
 ** Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+
 #include "mainwindow.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
 
 
diff --git a/noncore/apps/oxygen/main.cpp b/noncore/apps/oxygen/main.cpp
index 276b90d..e2a602b 100644
--- a/noncore/apps/oxygen/main.cpp
+++ b/noncore/apps/oxygen/main.cpp
@@ -15,9 +15,11 @@
  *                                                                         *
  **************************************************************************/
 
 #include <opie2/oapplicationfactory.h>
 
 #include "oxygen.h"
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Oxygen> )
diff --git a/noncore/apps/tableviewer/main.cpp b/noncore/apps/tableviewer/main.cpp
index 80a76e0..7ef281c 100644
--- a/noncore/apps/tableviewer/main.cpp
+++ b/noncore/apps/tableviewer/main.cpp
@@ -16,10 +16,12 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "tableviewer.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<TableViewerWindow> )
+using namespace Opie::Core;
 
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index 4c6d809..102b94c 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -25,17 +25,17 @@
 #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>
+#include <qtoolbar.h>
 
 /* QTE includes */
 #include <qmenubar.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qbuffer.h>
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
index 8e68262..c3a0a2e 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.cpp
@@ -42,16 +42,18 @@
 #include <qcombobox.h>
 #include <kfontdialog.h>
 
 #include "../document/katedocument.h"
 #include "kateviewdialog.h"
 #include <opie2/ofontselector.h>
 
 
+using namespace Opie::Ui;
+using namespace Opie::Ui;
 SearchDialog::SearchDialog( QWidget *parent, QStringList &searchFor, QStringList &replaceWith, int flags )
   : KDialogBase( parent, 0L, true, i18n( "Find Text" ), Ok | Cancel, Ok )
   , m_replace( 0L )
 {
   QWidget *page = new QWidget( this );
   setMainWidget( page );
 
   QVBoxLayout *topLayout = new QVBoxLayout( page, 0, spacingHint() );
diff --git a/noncore/apps/tinykate/libkate/view/kateviewdialog.h b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
index 98d8799..d081152 100644
--- a/noncore/apps/tinykate/libkate/view/kateviewdialog.h
+++ b/noncore/apps/tinykate/libkate/view/kateviewdialog.h
@@ -179,17 +179,17 @@ public:
 
   FontConfig( QWidget *parent = 0, char *name = 0 );
   ~FontConfig();
 
   void setFont ( const QFont &font );
   QFont getFont ( ) { return myFont; };
 
   private:
-  Opie::OFontSelector *m_fontselect;
+  Opie::Opie::Ui::OFontSelector *m_fontselect;
 //    class KFontChooser *m_fontchooser;
     QFont myFont;
 
   private slots:
     void slotFontSelected( const QFont &font );
 };
 
 
diff --git a/noncore/apps/tinykate/main.cpp b/noncore/apps/tinykate/main.cpp
index e62930c..c14d10a 100644
--- a/noncore/apps/tinykate/main.cpp
+++ b/noncore/apps/tinykate/main.cpp
@@ -1,9 +1,10 @@
 /***************************************************************************
+
                              main.cpp
                              -------------------
     begin                : November 2002
     copyright            : (C) 2002 by Joseph Wenninger <jowenn@kde.org>
  ***************************************************************************/
 
 /***************************************************************************
  *                                                                         *
@@ -13,10 +14,12 @@
  *   ONLY VERSION 2 OF THE LICENSE IS APPLICABLE                           *
  *                                                                         *
  ***************************************************************************/
 
 #include <opie2/oapplicationfactory.h>
 
 #include "tinykate.h"
 
+using namespace Opie::Core;
+
 OPIE_EXPORT_APP( OApplicationFactory<TinyKate> )
 
diff --git a/noncore/apps/tinykate/tinykate.cpp b/noncore/apps/tinykate/tinykate.cpp
index 32c1eab..3c9a637 100644
--- a/noncore/apps/tinykate/tinykate.cpp
+++ b/noncore/apps/tinykate/tinykate.cpp
@@ -22,16 +22,17 @@
 
 #include <opie2/ofiledialog.h>
 
 #include "tinykate.h"
 
 #include <katedocument.h>
 #include <kglobal.h>
 
+using namespace Opie::Ui;
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     QMainWindow( parent, name, f )
 {
   shutDown=false;
   nextUnnamed=0;
   currentView=0;
   viewCount=0;
   setCaption(tr("TinyKATE"));
@@ -161,17 +162,17 @@ TinyKate::~TinyKate( )
   if( KGlobal::config() != 0 ) {
     qWarning("deleting KateConfig object..\n");
     delete KGlobal::config();
   }
 }
 
 void TinyKate::slotOpen( )
 {
-    QString filename = Opie::OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
+    QString filename = OFileDialog::getOpenFileName( OFileSelector::EXTENDED_ALL,
                                                 QString::null);
   if (!filename.isEmpty()) {
     open(filename);
   }
 }
 
 void TinyKate::open(const QString & filename)
 {
@@ -256,18 +257,18 @@ void TinyKate::slotSave() {
   //    kv->save();
   //    kd->saveFile();
 }
 
 void TinyKate::slotSaveAs() {
   if (currentView==0) return;
   KateDocument *kd = (KateDocument*) currentView->document();
 
-  QString filename= Opie::OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
-                                                QString::null);
+  QString filename= OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL,
+                                                 QString::null);
   if (!filename.isEmpty()) {
     qDebug("saving file "+filename);
     QFileInfo fi(filename);
     QString filenamed = fi.fileName();
     kd->setDocFile( filename);
     kd->setDocName( filenamed);
     kd->saveFile();
 //   KTextEditor::View *dv = currentView;
diff --git a/noncore/apps/tinykate/tinykate.h b/noncore/apps/tinykate/tinykate.h
index f844c55..f435c03 100644
--- a/noncore/apps/tinykate/tinykate.h
+++ b/noncore/apps/tinykate/tinykate.h
@@ -45,17 +45,17 @@ protected slots:
     void slotClose();
     void slotCurrentChanged(QWidget *);
     void slotSave();
     void slotSaveAs();
 protected:
     void open(const QString&);
 private:
     QString currentFileName;
-    OTabWidget *tabwidget;
+    Opie::Ui::OTabWidget *tabwidget;
     KTextEditor::View *currentView;
     bool shutDown;
 
     QToolButton *editCopy, *editCut, *editPaste, *editUndo, *editRedo,  *editFindReplace;
     QAction *viewIncFontSizes, *viewDecFontSizes, *utilSettings;
 
     QPopupMenu *hlmenu;
     uint nextUnnamed;
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index a3467e5..3df55eb 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -25,18 +25,17 @@
 #include "infoform.h"
 #include "zlistview.h"
 #include "shadedlistitem.h"
 
 #ifndef DESKTOP
 #ifndef NO_OPIE
 #include <opie2/ofiledialog.h>
 
-using Opie::OFileDialog;
-using Opie::OFileSelector;
+using namespace Opie::Ui;
 #else
 #include "scqtfileedit.h"
 #endif
 #endif
 
 #include <qclipboard.h>
 
 #include <stdio.h>