Diffstat (limited to 'noncore/settings/aqpkg/ipkg.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/aqpkg/ipkg.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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 | |||
@@ -33,24 +33,25 @@ | |||
33 | #include <qpe/qpeapplication.h> | 33 | #include <qpe/qpeapplication.h> |
34 | #else | 34 | #else |
35 | #include <qapplication.h> | 35 | #include <qapplication.h> |
36 | #endif | 36 | #endif |
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
40 | 40 | ||
41 | #include "utils.h" | 41 | #include "utils.h" |
42 | #include "ipkg.h" | 42 | #include "ipkg.h" |
43 | #include "global.h" | 43 | #include "global.h" |
44 | 44 | ||
45 | using namespace Opie::Core; | ||
45 | Ipkg :: Ipkg() | 46 | Ipkg :: Ipkg() |
46 | { | 47 | { |
47 | proc = 0; | 48 | proc = 0; |
48 | } | 49 | } |
49 | 50 | ||
50 | Ipkg :: ~Ipkg() | 51 | Ipkg :: ~Ipkg() |
51 | { | 52 | { |
52 | } | 53 | } |
53 | 54 | ||
54 | // Option is what we are going to do - install, upgrade, download, reinstall | 55 | // Option is what we are going to do - install, upgrade, download, reinstall |
55 | // package is the package name to install - either a fully qualified path and ipk | 56 | // package is the package name to install - either a fully qualified path and ipk |
56 | // file (if stored locally) or just the name of the package (for a network package) | 57 | // file (if stored locally) or just the name of the package (for a network package) |
@@ -279,31 +280,31 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) | |||
279 | if ( proc ) | 280 | if ( proc ) |
280 | { | 281 | { |
281 | delete proc; | 282 | delete proc; |
282 | proc = 0; | 283 | proc = 0; |
283 | } | 284 | } |
284 | 285 | ||
285 | // OK we're gonna use OProcess to run this thing | 286 | // OK we're gonna use OProcess to run this thing |
286 | proc = new OProcess(); | 287 | proc = new OProcess(); |
287 | aborted = false; | 288 | aborted = false; |
288 | 289 | ||
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 | ||
300 | for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) | 301 | for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) |
301 | { | 302 | { |
302 | *proc << (*it).latin1(); | 303 | *proc << (*it).latin1(); |
303 | } | 304 | } |
304 | 305 | ||
305 | // Start the process going | 306 | // Start the process going |
306 | finished = false; | 307 | finished = false; |
307 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) | 308 | if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) |
308 | { | 309 | { |
309 | emit outputText( tr("Couldn't start ipkg process" ) ); | 310 | emit outputText( tr("Couldn't start ipkg process" ) ); |