-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 @@ | |||
34 | #include <mntent.h> | 34 | #include <mntent.h> |
35 | 35 | ||
36 | using namespace Opie::Ui; | ||
37 | |||
36 | #ifdef NOQUICKLAUNCH | 38 | #ifdef NOQUICKLAUNCH |
37 | AdvancedFm::AdvancedFm( ) | 39 | 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 @@ | |||
31 | #include <qpixmap.h> | 31 | #include <qpixmap.h> |
32 | 32 | ||
33 | using Opie::OSplitter; | ||
34 | 33 | ||
35 | class QVBoxLayout; | 34 | class QVBoxLayout; |
@@ -97,5 +96,5 @@ protected slots: | |||
97 | protected: | 96 | protected: |
98 | 97 | ||
99 | OSplitter *TabWidget; | 98 | Opie::Ui::OSplitter *TabWidget; |
100 | QCopChannel * channel; | 99 | QCopChannel * channel; |
101 | QPixmap unknownXpm; | 100 | QPixmap unknownXpm; |
@@ -182,6 +181,6 @@ private: | |||
182 | 181 | ||
183 | private slots: | 182 | private slots: |
184 | void processEnded(OProcess *); | 183 | void processEnded(Opie::Core::OProcess *); |
185 | void oprocessStderr(OProcess *, char *, int); | 184 | void oprocessStderr(Opie::Core::OProcess *, char *, int); |
186 | void gotoCustomDir(const QString &); | 185 | void gotoCustomDir(const QString &); |
187 | void qcopReceive(const QCString&, const QByteArray&); | 186 | 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 @@ | |||
28 | 28 | ||
29 | 29 | ||
30 | using namespace Opie::Ui; | ||
30 | void AdvancedFm::init() { | 31 | void AdvancedFm::init() { |
31 | #if defined(QT_QWS_OPIE) | 32 | #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 @@ | |||
33 | 33 | ||
34 | 34 | ||
35 | using namespace Opie::Core; | ||
36 | using namespace Opie::Core; | ||
35 | void AdvancedFm::doDirChange() { | 37 | void AdvancedFm::doDirChange() { |
36 | QString pathItem = CurrentView()->currentItem()->text(0); | 38 | QString pathItem = CurrentView()->currentItem()->text(0); |
@@ -703,8 +705,8 @@ void AdvancedFm::startProcess(const QString & cmd) { | |||
703 | OProcess *process; | 705 | OProcess *process; |
704 | process = new OProcess(); | 706 | process = new OProcess(); |
705 | connect(process, SIGNAL(processExited(OProcess*)), | 707 | connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), |
706 | this, SLOT( processEnded(OProcess*))); | 708 | this, SLOT( processEnded(OProcess*))); |
707 | 709 | ||
708 | connect(process, SIGNAL( receivedStderr(OProcess*,char*,int)), | 710 | connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), |
709 | this, SLOT( oprocessStderr(OProcess*,char*,int))); | 711 | this, SLOT( oprocessStderr(OProcess*,char*,int))); |
710 | 712 | ||
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 @@ | |||
1 | 1 | ||
2 | /*************************************************************************** | 2 | /*************************************************************************** |
3 | using namespace Opie::Core; | ||
4 | using namespace Opie::Core; | ||
3 | main.cpp - description | 5 | main.cpp - description |
4 | ------------------- | 6 | ------------------- |
@@ -13,21 +15,8 @@ | |||
13 | 15 | ||
14 | #include "advancedfm.h" | 16 | #include "advancedfm.h" |
15 | |||
16 | #ifdef NOQUICKLAUNCH | ||
17 | |||
18 | #include <qpe/qpeapplication.h> | ||
19 | |||
20 | int main(int argc, char *argv[]) | ||
21 | { | ||
22 | QPEApplication a(argc, argv); | ||
23 | |||
24 | AdvancedFm advencedFm; | ||
25 | a.showMainWidget( &advencedFm); | ||
26 | return a.exec(); | ||
27 | } | ||
28 | #else | ||
29 | #include <opie2/oapplicationfactory.h> | 17 | #include <opie2/oapplicationfactory.h> |
30 | 18 | ||
19 | using namespace Opie::Core; | ||
20 | |||
31 | OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> ) | 21 | OPIE_EXPORT_APP( OApplicationFactory<AdvancedFm> ) |
32 | 22 | ||
33 | #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 @@ | |||
17 | 17 | ||
18 | /* XPM */ | 18 | /* XPM */ |
19 | using namespace Opie::Core; | ||
20 | using namespace Opie::Core; | ||
19 | static char * filesave_xpm[] = { | 21 | static char * filesave_xpm[] = { |
20 | "16 16 78 1", | 22 | "16 16 78 1", |
@@ -142,11 +144,11 @@ Output::Output( const QStringList commands, QWidget* parent, const char* name, | |||
142 | proc = new OProcess(); | 144 | proc = new OProcess(); |
143 | 145 | ||
144 | connect(proc, SIGNAL(processExited(OProcess*)), | 146 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
145 | this, SLOT( processFinished())); | 147 | this, SLOT( processFinished())); |
146 | 148 | ||
147 | connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)), | 149 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
148 | this, SLOT(commandStdout(OProcess*,char*,int))); | 150 | this, SLOT(commandStdout(OProcess*,char*,int))); |
149 | 151 | ||
150 | connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)), | 152 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
151 | this, SLOT(commandStderr(OProcess*,char*,int))); | 153 | this, SLOT(commandStderr(OProcess*,char*,int))); |
152 | 154 | ||
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: | |||
36 | protected: | 36 | protected: |
37 | QGridLayout* OutputLayout; | 37 | QGridLayout* OutputLayout; |
38 | OProcess *proc; | 38 | Opie::Core::OProcess *proc; |
39 | protected slots: | 39 | protected slots: |
40 | void saveOutput(); | 40 | void saveOutput(); |
41 | void commandStdout(OProcess*, char *, int); | 41 | void commandStdout(Opie::Core::OProcess*, char *, int); |
42 | void commandStdin(const QByteArray &); | 42 | void commandStdin(const QByteArray &); |
43 | void commandStderr(OProcess*, char *, int); | 43 | void commandStderr(Opie::Core::OProcess*, char *, int); |
44 | void processFinished(); | 44 | void processFinished(); |
45 | private: | 45 | private: |