From 3d27828732fe7e499219ad6e208dc13dead86431 Mon Sep 17 00:00:00 2001
From: zecke <zecke>
Date: Sat, 13 Mar 2004 22:41:59 +0000
Subject: Namespace changes for Apps

QAshMoney and Reader need to be valgrinded
---
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
@@ -33,6 +33,8 @@
 #include <sys/vfs.h>
 #include <mntent.h>
 
+using namespace Opie::Ui;
+
 #ifdef NOQUICKLAUNCH
 AdvancedFm::AdvancedFm( )
 #else
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
@@ -30,7 +30,6 @@
 #include <qtimer.h>
 #include <qpixmap.h>
 
-using Opie::OSplitter;
 
 class QVBoxLayout;
 class QHBoxLayout;
@@ -96,7 +95,7 @@ protected slots:
 
 protected:
 
-   OSplitter *TabWidget;
+   Opie::Ui::OSplitter *TabWidget;
    QCopChannel * channel;
    QPixmap unknownXpm;
    int whichTab;
@@ -181,8 +180,8 @@ private:
    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 &);
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
@@ -27,6 +27,7 @@
 #include <sys/utsname.h>
 
 
+using namespace Opie::Ui;
 void AdvancedFm::init() {
 #if defined(QT_QWS_OPIE)
     qDebug("<<<<<<<<<<<<<<<<<<<<<<<< OPIE!!!");
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
@@ -32,6 +32,8 @@
 #include <fcntl.h>
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 void AdvancedFm::doDirChange() {
    QString pathItem = CurrentView()->currentItem()->text(0);
    if( pathItem == "../") {
@@ -702,10 +704,10 @@ 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";
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,5 +1,7 @@
 
 /***************************************************************************
+using namespace Opie::Core;
+using namespace Opie::Core;
                           main.cpp  -  description
                              -------------------
     begin                : March 10, 2002
@@ -12,22 +14,9 @@
  ***************************************************************************/
 
 #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
@@ -16,6 +16,8 @@
 #include <errno.h>
 
 /* XPM */
+using namespace Opie::Core;
+using namespace Opie::Core;
 static char * filesave_xpm[] = {
 "16 16 78 1",
 "   c None",
@@ -141,13 +143,13 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 
     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&)),
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
@@ -35,12 +35,12 @@ public:
 
 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;
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
@@ -58,6 +58,7 @@
 #define COL_BAL         6
 
 // --- Checkbook --------------------------------------------------------------
+using namespace Opie::Ui;
 Checkbook::Checkbook( QWidget *parent, CBInfo *i, Cfg *cfg )
     : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
 {
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
@@ -35,7 +35,6 @@
 #include <qdialog.h>
 #include <qlistview.h>
 
-using Opie::OTabWidget;
 
 class CBInfo;
 class Graph;
@@ -73,7 +72,7 @@ class Checkbook : public QDialog
         TranInfoList *tranList;
         Cfg *_pCfg;
 
-        OTabWidget *mainWidget;
+        Opie::Ui::OTabWidget *mainWidget;
         void        loadCheckbook();
         void        adjustBalance();
 
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
@@ -28,6 +28,8 @@
 
 #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
@@ -35,7 +35,7 @@
 #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>
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
@@ -21,4 +21,6 @@
 #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
@@ -29,8 +29,7 @@
 #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)
 {
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
@@ -16,7 +16,7 @@
 #include "searchresults.h"
 #include "bac.h"
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 //#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.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,6 +1,8 @@
 
 #include "io_bt.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
@@ -36,7 +38,7 @@ bool IOBt::open() {
 
         // 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() ) {
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
@@ -41,10 +41,10 @@ public slots:
     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);
 
 };
 
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,6 +1,8 @@
 
 #include "io_irda.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
@@ -27,7 +29,7 @@ bool IOIrda::open() {
     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() ) {
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
@@ -39,10 +39,10 @@ public slots:
     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);
 
 };
 
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
@@ -3,6 +3,8 @@
 
 #include "dialer.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 IOModem::IOModem( const Profile &profile )
 	: IOSerial( profile ) {
 	m_profile = profile;
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
@@ -67,7 +67,7 @@ private:
     Profile m_profile;
 
 private slots:
-    void slotExited(OProcess* proc);
+    void slotExited(Opie::Core::OProcess* proc);
 
 };
 
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
@@ -24,6 +24,7 @@
 #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++ ) {
@@ -332,7 +333,7 @@ void MainWindow::slotSaveScript() {
         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")
@@ -705,7 +706,7 @@ void MainWindow::slotSaveHistory() {
     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);
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
@@ -9,6 +9,7 @@
 #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++ ) {
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
@@ -53,7 +53,7 @@ private:
     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;
 };
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
@@ -6,6 +6,8 @@
 
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 SzTransfer::SzTransfer(Type t, IOLayer *layer) : FileTransferLayer(layer), m_t(t)
 {
 }
@@ -25,11 +27,11 @@ void SzTransfer::sendFile(const QString& file) {
     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&)));
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
@@ -27,12 +27,12 @@ public slots:
     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;
 
 };
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,6 +1,7 @@
 
 #include "tabwidget.h"
 
+using namespace Opie::Ui;
 TabWidget::TabWidget( QWidget* parent, const char* name )
     : OTabWidget( parent, name ) {
     connect(this, SIGNAL( currentChanged(QWidget*) ),
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
@@ -9,7 +9,7 @@
  * 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 );
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
@@ -15,6 +15,8 @@
 
 #include "senderui.h"
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 SenderUI::SenderUI()
     : Sender() {
 
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
@@ -8,7 +8,7 @@
 class IOSerial;
 class FileTransfer;
 class QSocketNotifier;
-class OProcess;
+namespace Opie {namespace Core {class Opie::Core::OProcess;}}
 class SenderUI : public Sender {
     Q_OBJECT
 public:
@@ -27,7 +27,7 @@ private:
     FileTransfer* sz;
     int m_fd;
     QSocketNotifier* m_sock;
-    OProcess* m_proc;
+    Opie::Core::OProcess* m_proc;
 };
 
 
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
@@ -15,6 +15,7 @@
 
 #include "transferdialog.h"
 
+using namespace Opie::Ui;
 TransferDialog::TransferDialog(QWidget *parent, MainWindow *mainwindow, const char *)
 : QDialog(parent, 0l, false), m_win(mainwindow)
 {
@@ -98,7 +99,7 @@ void TransferDialog::slotFilename()
 {
     QString f;
 
-    f = Opie::OFileDialog::getOpenFileName(0);
+    f = OFileDialog::getOpenFileName(0);
     if(!f.isNull()) filename->setText(f);
 }
 
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
@@ -23,7 +23,7 @@
 #include <qwidgetstack.h>
 #ifdef USEQPE
 #include <qmenubar.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #endif
 #include <qmenubar.h>
 #include <qtoolbar.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
@@ -12,9 +12,12 @@
  * 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
@@ -19,10 +19,12 @@
 **
 **********************************************************************/
 
+
 #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
@@ -20,4 +20,6 @@
 #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
@@ -21,5 +21,7 @@
 
 #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
@@ -30,7 +30,7 @@
 /* QPE includes */
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 
 /* QTE includes */
 #include <qmenubar.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
@@ -47,6 +47,8 @@
 #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 )
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
@@ -184,7 +184,7 @@ public:
   QFont getFont ( ) { return myFont; };
 
   private:
-  Opie::OFontSelector *m_fontselect;
+  Opie::Opie::Ui::OFontSelector *m_fontselect;
 //    class KFontChooser *m_fontchooser;
     QFont myFont;
 
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,4 +1,5 @@
 /***************************************************************************
+
                              main.cpp
                              -------------------
     begin                : November 2002
@@ -18,5 +19,7 @@
 
 #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
@@ -27,6 +27,7 @@
 #include <katedocument.h>
 #include <kglobal.h>
 
+using namespace Opie::Ui;
 TinyKate::TinyKate( QWidget *parent, const char *name, WFlags f) :
     QMainWindow( parent, name, f )
 {
@@ -166,7 +167,7 @@ TinyKate::~TinyKate( )
 
 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);
@@ -261,8 +262,8 @@ 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);
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
@@ -50,7 +50,7 @@ protected:
     void open(const QString&);
 private:
     QString currentFileName;
-    OTabWidget *tabwidget;
+    Opie::Ui::OTabWidget *tabwidget;
     KTextEditor::View *currentView;
     bool shutDown;
 
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
@@ -30,8 +30,7 @@
 #ifndef NO_OPIE
 #include <opie2/ofiledialog.h>
 
-using Opie::OFileDialog;
-using Opie::OFileSelector;
+using namespace Opie::Ui;
 #else
 #include "scqtfileedit.h"
 #endif
--
cgit v0.9.0.2