author | zecke <zecke> | 2004-03-14 16:01:52 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 16:01:52 (UTC) |
commit | f12af18557c8f376f0c6c30e80a85737ff6c592e (patch) (unidiff) | |
tree | d60806f34f4ff6af82491579e80c9ef72cd4071e /noncore/settings/aqpkg | |
parent | 13aeeabab5f2a6262b33de83cc9559a49365e325 (diff) | |
download | opie-f12af18557c8f376f0c6c30e80a85737ff6c592e.zip opie-f12af18557c8f376f0c6c30e80a85737ff6c592e.tar.gz opie-f12af18557c8f376f0c6c30e80a85737ff6c592e.tar.bz2 |
Make use of ODP
-rw-r--r-- | noncore/settings/aqpkg/installdlgimpl.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 7 | ||||
-rw-r--r-- | noncore/settings/aqpkg/ipkg.h | 8 | ||||
-rw-r--r-- | noncore/settings/aqpkg/main.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/aqpkg/settingsimpl.cpp | 4 |
5 files changed, 14 insertions, 9 deletions
diff --git a/noncore/settings/aqpkg/installdlgimpl.cpp b/noncore/settings/aqpkg/installdlgimpl.cpp index d2babb4..da21cef 100644 --- a/noncore/settings/aqpkg/installdlgimpl.cpp +++ b/noncore/settings/aqpkg/installdlgimpl.cpp | |||
@@ -58,4 +58,5 @@ | |||
58 | #include "global.h" | 58 | #include "global.h" |
59 | 59 | ||
60 | using namespace Opie::Ui; | ||
60 | enum { | 61 | enum { |
61 | MAXLINES = 100, | 62 | MAXLINES = 100, |
@@ -234,5 +235,5 @@ void InstallDlgImpl :: optionsSelected() | |||
234 | map.insert( tr( "All" ), text ); | 235 | map.insert( tr( "All" ), text ); |
235 | 236 | ||
236 | QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); | 237 | QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); |
237 | if( !filename.isEmpty() ) | 238 | if( !filename.isEmpty() ) |
238 | { | 239 | { |
diff --git a/noncore/settings/aqpkg/ipkg.cpp b/noncore/settings/aqpkg/ipkg.cpp index 866afed..0091a3b 100644 --- a/noncore/settings/aqpkg/ipkg.cpp +++ b/noncore/settings/aqpkg/ipkg.cpp | |||
@@ -43,4 +43,5 @@ | |||
43 | #include "global.h" | 43 | #include "global.h" |
44 | 44 | ||
45 | using namespace Opie::Core; | ||
45 | Ipkg :: Ipkg() | 46 | Ipkg :: Ipkg() |
46 | { | 47 | { |
@@ -289,11 +290,11 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) | |||
289 | 290 | ||
290 | // Connect up our slots | 291 | // Connect up our slots |
291 | connect(proc, SIGNAL(processExited(OProcess*)), | 292 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
292 | this, SLOT( processFinished())); | 293 | this, SLOT( processFinished())); |
293 | 294 | ||
294 | connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)), | 295 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
295 | this, SLOT(commandStdout(OProcess*,char*,int))); | 296 | this, SLOT(commandStdout(OProcess*,char*,int))); |
296 | 297 | ||
297 | connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)), | 298 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
298 | this, SLOT(commandStderr(OProcess*,char*,int))); | 299 | this, SLOT(commandStderr(OProcess*,char*,int))); |
299 | 300 | ||
diff --git a/noncore/settings/aqpkg/ipkg.h b/noncore/settings/aqpkg/ipkg.h index f892038..e216d17 100644 --- a/noncore/settings/aqpkg/ipkg.h +++ b/noncore/settings/aqpkg/ipkg.h | |||
@@ -48,5 +48,5 @@ | |||
48 | #define VERBOSE_WGET 0x0020 | 48 | #define VERBOSE_WGET 0x0020 |
49 | 49 | ||
50 | class OProcess; | 50 | namespace Opie {namespace Core {class OProcess;}} |
51 | 51 | ||
52 | class Ipkg : public QObject | 52 | class Ipkg : public QObject |
@@ -71,6 +71,6 @@ signals: | |||
71 | 71 | ||
72 | public slots: | 72 | public slots: |
73 | void commandStdout(OProcess*, char *buffer, int buflen); | 73 | void commandStdout(Opie::Core::OProcess*, char *buffer, int buflen); |
74 | void commandStderr(OProcess*, char *buffer, int buflen); | 74 | void commandStderr(Opie::Core::OProcess*, char *buffer, int buflen); |
75 | void processFinished(); | 75 | void processFinished(); |
76 | void abort(); | 76 | void abort(); |
@@ -86,5 +86,5 @@ private: | |||
86 | QString destDir; | 86 | QString destDir; |
87 | QString runtimeDir; | 87 | QString runtimeDir; |
88 | OProcess *proc; | 88 | Opie::Core::OProcess *proc; |
89 | int flags; | 89 | int flags; |
90 | int infoLevel; | 90 | int infoLevel; |
diff --git a/noncore/settings/aqpkg/main.cpp b/noncore/settings/aqpkg/main.cpp index b391714..d27479c 100644 --- a/noncore/settings/aqpkg/main.cpp +++ b/noncore/settings/aqpkg/main.cpp | |||
@@ -36,3 +36,4 @@ extern QString LOCAL_SERVER; | |||
36 | extern QString LOCAL_IPKGS; | 36 | extern QString LOCAL_IPKGS; |
37 | 37 | ||
38 | using namespace Opie::Core; | ||
38 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 39 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) |
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp index b9dbb6e..2f35617 100644 --- a/noncore/settings/aqpkg/settingsimpl.cpp +++ b/noncore/settings/aqpkg/settingsimpl.cpp | |||
@@ -53,4 +53,6 @@ | |||
53 | using namespace std; | 53 | using namespace std; |
54 | 54 | ||
55 | using namespace Opie::Ui; | ||
56 | using namespace Opie::Ui; | ||
55 | SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) | 57 | SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) |
56 | : QDialog( parent, name, modal, fl ) | 58 | : QDialog( parent, name, modal, fl ) |
@@ -64,5 +66,5 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const | |||
64 | 66 | ||
65 | // Setup tabs for all info | 67 | // Setup tabs for all info |
66 | Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this ); | 68 | OTabWidget *tabwidget = new OTabWidget( this ); |
67 | layout->addWidget( tabwidget ); | 69 | layout->addWidget( tabwidget ); |
68 | 70 | ||