Namespace changes for Apps

QAshMoney and Reader need to be valgrinded

7 files changed, 22 insertions, 27 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
@@ -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;