-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 7 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmData.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 6 | ||||
-rw-r--r-- | noncore/apps/advancedfm/main.cpp | 19 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.cpp | 8 | ||||
-rw-r--r-- | noncore/apps/advancedfm/output.h | 6 |
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 @@ -34,4 +34,6 @@ #include <mntent.h> +using namespace Opie::Ui; + #ifdef NOQUICKLAUNCH AdvancedFm::AdvancedFm( ) 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 @@ -31,5 +31,4 @@ #include <qpixmap.h> -using Opie::OSplitter; class QVBoxLayout; @@ -97,5 +96,5 @@ protected slots: protected: - OSplitter *TabWidget; + Opie::Ui::OSplitter *TabWidget; QCopChannel * channel; QPixmap unknownXpm; @@ -182,6 +181,6 @@ private: 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&); 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 @@ -28,4 +28,5 @@ +using namespace Opie::Ui; void AdvancedFm::init() { #if defined(QT_QWS_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 @@ -33,4 +33,6 @@ +using namespace Opie::Core; +using namespace Opie::Core; void AdvancedFm::doDirChange() {
QString pathItem = CurrentView()->currentItem()->text(0);
@@ -703,8 +705,8 @@ void AdvancedFm::startProcess(const QString & cmd) { 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)));
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,4 +1,6 @@ /*************************************************************************** +using namespace Opie::Core; +using namespace Opie::Core; main.cpp - description ------------------- @@ -13,21 +15,8 @@ #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 @@ -17,4 +17,6 @@ /* XPM */ +using namespace Opie::Core; +using namespace Opie::Core; static char * filesave_xpm[] = { "16 16 78 1", @@ -142,11 +144,11 @@ 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))); 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 @@ -36,10 +36,10 @@ 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: |