summaryrefslogtreecommitdiff
path: root/noncore/settings/aqpkg
Unidiff
Diffstat (limited to 'noncore/settings/aqpkg') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/installdlgimpl.cpp3
-rw-r--r--noncore/settings/aqpkg/ipkg.cpp7
-rw-r--r--noncore/settings/aqpkg/ipkg.h8
-rw-r--r--noncore/settings/aqpkg/main.cpp1
-rw-r--r--noncore/settings/aqpkg/settingsimpl.cpp4
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
@@ -54,12 +54,13 @@
54#include "instoptionsimpl.h" 54#include "instoptionsimpl.h"
55#include "installdlgimpl.h" 55#include "installdlgimpl.h"
56#include "ipkg.h" 56#include "ipkg.h"
57#include "utils.h" 57#include "utils.h"
58#include "global.h" 58#include "global.h"
59 59
60using namespace Opie::Ui;
60enum { 61enum {
61 MAXLINES = 100, 62 MAXLINES = 100,
62}; 63};
63 64
64InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title ) 65InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
65 : QWidget( 0, 0, 0 ) 66 : QWidget( 0, 0, 0 )
@@ -230,13 +231,13 @@ void InstallDlgImpl :: optionsSelected()
230 QStringList text; 231 QStringList text;
231 text << "text/*"; 232 text << "text/*";
232 map.insert(tr( "Text" ), text ); 233 map.insert(tr( "Text" ), text );
233 text << "*"; 234 text << "*";
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 {
239 QString currentFileName = QFileInfo( filename ).fileName(); 240 QString currentFileName = QFileInfo( filename ).fileName();
240 DocLnk doc; 241 DocLnk doc;
241 doc.setType( "text/plain" ); 242 doc.setType( "text/plain" );
242 doc.setFile( filename ); 243 doc.setFile( filename );
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
@@ -39,12 +39,13 @@
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
45using namespace Opie::Core;
45Ipkg :: Ipkg() 46Ipkg :: Ipkg()
46{ 47{
47 proc = 0; 48 proc = 0;
48} 49}
49 50
50Ipkg :: ~Ipkg() 51Ipkg :: ~Ipkg()
@@ -285,19 +286,19 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
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 }
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
@@ -44,13 +44,13 @@
44#define FORCE_REMOVE 0x0002 44#define FORCE_REMOVE 0x0002
45#define FORCE_REINSTALL 0x0004 45#define FORCE_REINSTALL 0x0004
46#define FORCE_OVERWRITE 0x0008 46#define FORCE_OVERWRITE 0x0008
47#define MAKE_LINKS 0x0010 47#define MAKE_LINKS 0x0010
48#define VERBOSE_WGET 0x0020 48#define VERBOSE_WGET 0x0020
49 49
50class OProcess; 50namespace Opie {namespace Core {class OProcess;}}
51 51
52class Ipkg : public QObject 52class Ipkg : public QObject
53{ 53{
54 Q_OBJECT 54 Q_OBJECT
55public: 55public:
56 Ipkg(); 56 Ipkg();
@@ -67,14 +67,14 @@ public:
67 67
68signals: 68signals:
69 void outputText( const QString &text ); 69 void outputText( const QString &text );
70 void ipkgFinished(); 70 void ipkgFinished();
71 71
72public slots: 72public 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();
77 77
78 78
79private: 79private:
80 bool createLinks; 80 bool createLinks;
@@ -82,13 +82,13 @@ private:
82 bool error; 82 bool error;
83 QString option; 83 QString option;
84 QString package; 84 QString package;
85 QString destination; 85 QString destination;
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;
91 bool finished; 91 bool finished;
92 92
93 QList<QString> *dependantPackages; 93 QList<QString> *dependantPackages;
94 94
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
@@ -32,7 +32,8 @@
32#include <opie2/oapplicationfactory.h> 32#include <opie2/oapplicationfactory.h>
33 33
34/* be less intrusive for translation -zecke */ 34/* be less intrusive for translation -zecke */
35extern QString LOCAL_SERVER; 35extern QString LOCAL_SERVER;
36extern QString LOCAL_IPKGS; 36extern QString LOCAL_IPKGS;
37 37
38using namespace Opie::Core;
38OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) 39OPIE_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
@@ -49,24 +49,26 @@
49 49
50/* STD */ 50/* STD */
51#include <fstream> 51#include <fstream>
52#include <algorithm> 52#include <algorithm>
53using namespace std; 53using namespace std;
54 54
55using namespace Opie::Ui;
56using namespace Opie::Ui;
55SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) 57SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
56 : QDialog( parent, name, modal, fl ) 58 : QDialog( parent, name, modal, fl )
57{ 59{
58 setCaption( tr( "Configuration" ) ); 60 setCaption( tr( "Configuration" ) );
59 61
60 // Setup layout to make everything pretty 62 // Setup layout to make everything pretty
61 QVBoxLayout *layout = new QVBoxLayout( this ); 63 QVBoxLayout *layout = new QVBoxLayout( this );
62 layout->setMargin( 2 ); 64 layout->setMargin( 2 );
63 layout->setSpacing( 4 ); 65 layout->setSpacing( 4 );
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
69 tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) ); 71 tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );
70 tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) ); 72 tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
71 tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) ); 73 tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
72 tabwidget->setCurrentTab( tr( "Servers" ) ); 74 tabwidget->setCurrentTab( tr( "Servers" ) );