summaryrefslogtreecommitdiff
Unidiff
Diffstat (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
-rw-r--r--noncore/settings/backup/main.cpp1
-rw-r--r--noncore/settings/doctab/main.cpp1
-rw-r--r--noncore/settings/language/main.cpp1
-rw-r--r--noncore/settings/mediummount/main.cpp1
-rw-r--r--noncore/settings/netsystemtime/main.cpp1
-rw-r--r--noncore/settings/netsystemtime/mainwindow.cpp6
-rw-r--r--noncore/settings/netsystemtime/mainwindow.h9
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp2
-rw-r--r--noncore/settings/networksettings/main.cpp1
-rw-r--r--noncore/settings/networksettings/networksettings.pro2
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp1
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp2.cpp2
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp2.h6
-rw-r--r--noncore/settings/packagemanager/installdlg.cpp3
-rw-r--r--noncore/settings/packagemanager/main.cpp1
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.cpp1
-rw-r--r--noncore/settings/packagemanager/oipkgconfigdlg.h2
-rw-r--r--noncore/settings/packagemanager/packageinfodlg.cpp1
-rw-r--r--noncore/settings/sound/main.cpp1
-rw-r--r--noncore/settings/sshkeys/sshkeys.cpp15
-rw-r--r--noncore/settings/sshkeys/sshkeys.h10
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp21
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.h22
-rw-r--r--noncore/settings/sysinfo/main.cpp1
-rw-r--r--noncore/settings/sysinfo/modulesinfo.cpp10
-rw-r--r--noncore/settings/sysinfo/modulesinfo.h10
-rw-r--r--noncore/settings/sysinfo/processinfo.cpp11
-rw-r--r--noncore/settings/sysinfo/processinfo.h10
-rw-r--r--noncore/settings/sysinfo/sysinfo.cpp1
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp2
-rw-r--r--noncore/settings/usermanager/main.cpp1
-rw-r--r--noncore/settings/usermanager/userdialog.cpp3
37 files changed, 115 insertions, 68 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
@@ -56,8 +56,9 @@
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
@@ -232,9 +233,9 @@ void InstallDlgImpl :: optionsSelected()
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;
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
@@ -41,8 +41,9 @@
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}
@@ -287,15 +288,15 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
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 {
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
@@ -46,9 +46,9 @@
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
@@ -69,10 +69,10 @@ signals:
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
@@ -84,9 +84,9 @@ private:
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
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
@@ -34,5 +34,6 @@
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
@@ -51,8 +51,10 @@
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" ) );
@@ -62,9 +64,9 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const
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" ) );
diff --git a/noncore/settings/backup/main.cpp b/noncore/settings/backup/main.cpp
index c254865..6246fd5 100644
--- a/noncore/settings/backup/main.cpp
+++ b/noncore/settings/backup/main.cpp
@@ -3,6 +3,7 @@
3#include <qpe/qpeapplication.h> 3#include <qpe/qpeapplication.h>
4#include <opie2/oapplicationfactory.h> 4#include <opie2/oapplicationfactory.h>
5 5
6 6
7using namespace Opie::Core;
7OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<BackupAndRestore> ) 8OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<BackupAndRestore> )
8 9
diff --git a/noncore/settings/doctab/main.cpp b/noncore/settings/doctab/main.cpp
index 13591e0..75d9fcb 100644
--- a/noncore/settings/doctab/main.cpp
+++ b/noncore/settings/doctab/main.cpp
@@ -21,5 +21,6 @@
21#include "doctab.h" 21#include "doctab.h"
22 22
23#include <opie2/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
24 24
25using namespace Opie::Core;
25OPIE_EXPORT_APP( OApplicationFactory<DocTabSettings> ) 26OPIE_EXPORT_APP( OApplicationFactory<DocTabSettings> )
diff --git a/noncore/settings/language/main.cpp b/noncore/settings/language/main.cpp
index 17f7433..ec8366e 100644
--- a/noncore/settings/language/main.cpp
+++ b/noncore/settings/language/main.cpp
@@ -21,5 +21,6 @@
21#include "settings.h" 21#include "settings.h"
22 22
23#include <opie2/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
24 24
25using namespace Opie::Core;
25OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> ) 26OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> )
diff --git a/noncore/settings/mediummount/main.cpp b/noncore/settings/mediummount/main.cpp
index 8261490..5d188a9 100644
--- a/noncore/settings/mediummount/main.cpp
+++ b/noncore/settings/mediummount/main.cpp
@@ -3,6 +3,7 @@
3#include "mainwindow.h" 3#include "mainwindow.h"
4 4
5#include <opie2/oapplicationfactory.h> 5#include <opie2/oapplicationfactory.h>
6 6
7using namespace Opie::Core;
7OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MediumMountSetting::MainWindow> ) 8OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MediumMountSetting::MainWindow> )
8 9
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp
index 4a2d17c..dbcdc17 100644
--- a/noncore/settings/netsystemtime/main.cpp
+++ b/noncore/settings/netsystemtime/main.cpp
@@ -29,5 +29,6 @@
29#include "mainwindow.h" 29#include "mainwindow.h"
30 30
31#include <opie2/oapplicationfactory.h> 31#include <opie2/oapplicationfactory.h>
32 32
33using namespace Opie::Core;
33OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) 34OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/netsystemtime/mainwindow.cpp b/noncore/settings/netsystemtime/mainwindow.cpp
index c995d6e..ba96f33 100644
--- a/noncore/settings/netsystemtime/mainwindow.cpp
+++ b/noncore/settings/netsystemtime/mainwindow.cpp
@@ -47,8 +47,10 @@
47#include <qsocket.h> 47#include <qsocket.h>
48#include <qstring.h> 48#include <qstring.h>
49#include <qtimer.h> 49#include <qtimer.h>
50 50
51using namespace Opie::Ui;
52using namespace Opie::Core;
51MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) 53MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f )
52 : QDialog( 0x0, 0x0, TRUE, 0 ) 54 : QDialog( 0x0, 0x0, TRUE, 0 )
53{ 55{
54 setCaption( tr( "SystemTime" ) ); 56 setCaption( tr( "SystemTime" ) );
@@ -187,11 +189,11 @@ void MainWindow::runNTP()
187 189
188 if ( !ntpProcess ) 190 if ( !ntpProcess )
189 { 191 {
190 ntpProcess = new OProcess(); 192 ntpProcess = new OProcess();
191 connect( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), 193 connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
192 this, SLOT(slotNtpOutput(OProcess*,char*,int)) ); 194 this, SLOT(slotNtpOutput(OProcess*,char*,int)) );
193 connect( ntpProcess, SIGNAL(processExited(OProcess*)), 195 connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)),
194 this, SLOT(slotNtpFinished(OProcess*)) ); 196 this, SLOT(slotNtpFinished(OProcess*)) );
195 } 197 }
196 198
197 else 199 else
diff --git a/noncore/settings/netsystemtime/mainwindow.h b/noncore/settings/netsystemtime/mainwindow.h
index d4a9713..8701803 100644
--- a/noncore/settings/netsystemtime/mainwindow.h
+++ b/noncore/settings/netsystemtime/mainwindow.h
@@ -39,9 +39,8 @@ class FormatTabWidget;
39class SettingsTabWidget; 39class SettingsTabWidget;
40class NTPTabWidget; 40class NTPTabWidget;
41class PredictTabWidget; 41class PredictTabWidget;
42 42
43using Opie::OTabWidget;
44 43
45class QDateTime; 44class QDateTime;
46class QSocket; 45class QSocket;
47class QTimer; 46class QTimer;
@@ -59,9 +58,9 @@ protected:
59 void accept(); 58 void accept();
60 void reject(); 59 void reject();
61 60
62private: 61private:
63 OTabWidget *mainWidget; 62 Opie::Ui::OTabWidget *mainWidget;
64 63
65 TimeTabWidget *timeTab; 64 TimeTabWidget *timeTab;
66 FormatTabWidget *formatTab; 65 FormatTabWidget *formatTab;
67 SettingsTabWidget *settingsTab; 66 SettingsTabWidget *settingsTab;
@@ -70,9 +69,9 @@ private:
70 69
71 bool ntpTabEnabled; 70 bool ntpTabEnabled;
72 bool predictTabEnabled; 71 bool predictTabEnabled;
73 72
74 OProcess *ntpProcess; 73 Opie::Core::OProcess *ntpProcess;
75 QTimer *ntpTimer; 74 QTimer *ntpTimer;
76 QSocket *ntpSock; 75 QSocket *ntpSock;
77 int ntpDelay; 76 int ntpDelay;
78 bool ntpInteractive; 77 bool ntpInteractive;
@@ -89,10 +88,10 @@ private slots:
89 void slotDisplayPredictTab( bool ); 88 void slotDisplayPredictTab( bool );
90 void slotGetNTPTime(); 89 void slotGetNTPTime();
91 void slotTimerGetNTPTime(); 90 void slotTimerGetNTPTime();
92 void slotProbeNTPServer(); 91 void slotProbeNTPServer();
93 void slotNtpOutput( OProcess *, char *, int ); 92 void slotNtpOutput( Opie::Core::OProcess *, char *, int );
94 void slotNtpFinished( OProcess* ); 93 void slotNtpFinished( Opie::Core::OProcess* );
95 void slotNTPDelayChanged( int ); 94 void slotNTPDelayChanged( int );
96 void slotCheckNtp( int ); 95 void slotCheckNtp( int );
97}; 96};
98 97
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 05340e4..7c2f85c 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -21,8 +21,10 @@
21 21
22/** 22/**
23 * Constuctor. Set up the connection. A profile must be set. 23 * Constuctor. Set up the connection. A profile must be set.
24 */ 24 */
25using namespace Opie::Ui;
26using namespace Opie::Core;
25InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){ 27InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){
26 if (j == 0) { 28 if (j == 0) {
27 delInterfaces = true; 29 delInterfaces = true;
28 interfaces = new Interfaces; 30 interfaces = new Interfaces;
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/main.cpp
index bc11ab4..e4153c3 100644
--- a/noncore/settings/networksettings/main.cpp
+++ b/noncore/settings/networksettings/main.cpp
@@ -1,6 +1,7 @@
1#include "mainwindowimp.h" 1#include "mainwindowimp.h"
2#include <opie2/oapplicationfactory.h> 2#include <opie2/oapplicationfactory.h>
3 3
4using namespace Opie::Core;
4OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> ) 5OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> )
5 6
6 7
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro
index 5db2d6b..281629c 100644
--- a/noncore/settings/networksettings/networksettings.pro
+++ b/noncore/settings/networksettings/networksettings.pro
@@ -1,8 +1,8 @@
1CONFIG = qt warn_on debug quick-app 1CONFIG = qt warn_on debug quick-app
2HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h 2HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h
3SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp 3SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp
4INCLUDEPATH += $(OPIEDIR)/include interfaces/ 4INCLUDEPATH += $(OPIEDIR)/include interfaces/ .
5DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/ 5DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/
6LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2 6LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2
7INTERFACES = mainwindow.ui addconnection.ui 7INTERFACES = mainwindow.ui addconnection.ui
8TARGET = networksettings 8TARGET = networksettings
diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp
index 95f4abe..80a9927 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -24,8 +24,9 @@
24 24
25/** 25/**
26 * Constructor, read in the wireless.opts file for parsing later. 26 * Constructor, read in the wireless.opts file for parsing later.
27 */ 27 */
28using namespace Opie::Core;
28WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { 29WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") {
29 interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); 30 interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);
30 tabWidget->insertTab(interfaceSetup, "TCP/IP"); 31 tabWidget->insertTab(interfaceSetup, "TCP/IP");
31 32
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.cpp b/noncore/settings/networksettings/wlan/wlanimp2.cpp
index dd1db28..eeebe7f 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp2.cpp
@@ -41,8 +41,10 @@
41 41
42/** 42/**
43 * Constructor, read in the wireless.opts file for parsing later. 43 * Constructor, read in the wireless.opts file for parsing later.
44 */ 44 */
45using namespace Opie::Net;
46using namespace Opie::Core;
45WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") { 47WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") {
46 interfaces = new Interfaces(); 48 interfaces = new Interfaces();
47 interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces); 49 interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces);
48 tabWidget->insertTab(interfaceSetup, "TCP/IP"); 50 tabWidget->insertTab(interfaceSetup, "TCP/IP");
diff --git a/noncore/settings/networksettings/wlan/wlanimp2.h b/noncore/settings/networksettings/wlan/wlanimp2.h
index a777203..c3d1eee 100644
--- a/noncore/settings/networksettings/wlan/wlanimp2.h
+++ b/noncore/settings/networksettings/wlan/wlanimp2.h
@@ -8,9 +8,9 @@
8 8
9class InterfaceSetupImp; 9class InterfaceSetupImp;
10class Interface; 10class Interface;
11class Config; 11class Config;
12class OPacket; 12namespace Opie {namespace Net {class OPacket;}}
13class QListViewItem; 13class QListViewItem;
14 14
15const int col_mode= 0; 15const int col_mode= 0;
16const int col_ssid = 1; 16const int col_ssid = 1;
@@ -37,10 +37,10 @@ private:
37 void writeOpts(); 37 void writeOpts();
38 38
39 void parseKeyStr(QString keystr); 39 void parseKeyStr(QString keystr);
40 40
41 void handlePacket( OPacket* ); 41 void handlePacket( Opie::Net::OPacket* );
42 void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const OMacAddress& mac ); 42 void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const Opie::Net::OMacAddress& mac );
43 43
44 InterfaceSetupImp *interfaceSetup; 44 InterfaceSetupImp *interfaceSetup;
45 Interfaces *interfaces; 45 Interfaces *interfaces;
46 Interface *interface; 46 Interface *interface;
diff --git a/noncore/settings/packagemanager/installdlg.cpp b/noncore/settings/packagemanager/installdlg.cpp
index aedd972..4a55c10 100644
--- a/noncore/settings/packagemanager/installdlg.cpp
+++ b/noncore/settings/packagemanager/installdlg.cpp
@@ -48,8 +48,9 @@
48#include <opie2/ofiledialog.h> 48#include <opie2/ofiledialog.h>
49 49
50#include "opackagemanager.h" 50#include "opackagemanager.h"
51 51
52using namespace Opie::Ui;
52InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo, 53InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
53 OPackage::Command command1, QStringList *packages1, 54 OPackage::Command command1, QStringList *packages1,
54 OPackage::Command command2, QStringList *packages2, 55 OPackage::Command command2, QStringList *packages2,
55 OPackage::Command command3, QStringList *packages3 ) 56 OPackage::Command command3, QStringList *packages3 )
@@ -274,9 +275,9 @@ void InstallDlg::slotBtnOptions()
274 map.insert(tr( "Text" ), text ); 275 map.insert(tr( "Text" ), text );
275 text << "*"; 276 text << "*";
276 map.insert( tr( "All" ), text ); 277 map.insert( tr( "All" ), text );
277 278
278 QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); 279 QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
279 if( !filename.isEmpty() ) 280 if( !filename.isEmpty() )
280 { 281 {
281 QString currentFileName = QFileInfo( filename ).fileName(); 282 QString currentFileName = QFileInfo( filename ).fileName();
282 DocLnk doc; 283 DocLnk doc;
diff --git a/noncore/settings/packagemanager/main.cpp b/noncore/settings/packagemanager/main.cpp
index 18ed644..c050e1a 100644
--- a/noncore/settings/packagemanager/main.cpp
+++ b/noncore/settings/packagemanager/main.cpp
@@ -30,5 +30,6 @@
30#include "mainwindow.h" 30#include "mainwindow.h"
31 31
32#include <opie2/oapplicationfactory.h> 32#include <opie2/oapplicationfactory.h>
33 33
34using namespace Opie::Core;
34OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) 35OPIE_EXPORT_APP( OApplicationFactory<MainWindow> )
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.cpp b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
index 84c6de4..592de3e 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.cpp
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.cpp
@@ -41,8 +41,9 @@
41#include <qscrollview.h> 41#include <qscrollview.h>
42 42
43#include <qpe/resource.h> 43#include <qpe/resource.h>
44 44
45using namespace Opie::Ui;
45OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) 46OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
46 : QDialog( parent, QString::null, true ) 47 : QDialog( parent, QString::null, true )
47 , m_ipkg( ipkg ) 48 , m_ipkg( ipkg )
48 , m_configs( 0x0 ) 49 , m_configs( 0x0 )
diff --git a/noncore/settings/packagemanager/oipkgconfigdlg.h b/noncore/settings/packagemanager/oipkgconfigdlg.h
index 88e020a..0aba898 100644
--- a/noncore/settings/packagemanager/oipkgconfigdlg.h
+++ b/noncore/settings/packagemanager/oipkgconfigdlg.h
@@ -73,9 +73,9 @@ private:
73 QString m_destCurrName; // Name of currently selected destination in m_destList 73 QString m_destCurrName; // Name of currently selected destination in m_destList
74 74
75 // UI controls 75 // UI controls
76 QVBoxLayout m_layout; // Main dialog layout control 76 QVBoxLayout m_layout; // Main dialog layout control
77 OTabWidget m_tabWidget; // Main tab widget control 77 Opie::Ui::OTabWidget m_tabWidget; // Main tab widget control
78 QWidget *m_serverWidget; // Widget containing server configuration controls 78 QWidget *m_serverWidget; // Widget containing server configuration controls
79 QWidget *m_destWidget; // Widget containing destination configuration controls 79 QWidget *m_destWidget; // Widget containing destination configuration controls
80 QWidget *m_proxyWidget; // Widget containing proxy configuration controls 80 QWidget *m_proxyWidget; // Widget containing proxy configuration controls
81 QWidget *m_optionsWidget; // Widget containing ipkg execution configuration controls 81 QWidget *m_optionsWidget; // Widget containing ipkg execution configuration controls
diff --git a/noncore/settings/packagemanager/packageinfodlg.cpp b/noncore/settings/packagemanager/packageinfodlg.cpp
index 7abd17e..73d3de7 100644
--- a/noncore/settings/packagemanager/packageinfodlg.cpp
+++ b/noncore/settings/packagemanager/packageinfodlg.cpp
@@ -37,8 +37,9 @@
37#include <qpe/resource.h> 37#include <qpe/resource.h>
38 38
39#include <opie2/otabwidget.h> 39#include <opie2/otabwidget.h>
40 40
41using namespace Opie::Ui;
41PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) 42PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
42 : QWidget( 0x0 ) 43 : QWidget( 0x0 )
43 , m_packman( pm ) 44 , m_packman( pm )
44 , m_information( this ) 45 , m_information( this )
diff --git a/noncore/settings/sound/main.cpp b/noncore/settings/sound/main.cpp
index 49497c3..946bb3a 100644
--- a/noncore/settings/sound/main.cpp
+++ b/noncore/settings/sound/main.cpp
@@ -21,8 +21,9 @@
21#include "soundsettings.h" 21#include "soundsettings.h"
22 22
23#include <opie2/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
24 24
25using namespace Opie::Core;
25OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) 26OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> )
26 27
27 28
28 29
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp
index e76fd6b..31f6b85 100644
--- a/noncore/settings/sshkeys/sshkeys.cpp
+++ b/noncore/settings/sshkeys/sshkeys.cpp
@@ -32,8 +32,9 @@
32#include <unistd.h> 32#include <unistd.h>
33#include <stdio.h> 33#include <stdio.h>
34#include <ctype.h> 34#include <ctype.h>
35 35
36using namespace Opie::Core;
36static char *keynames[] = { "identity", "id_rsa", "id_dsa" }; 37static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
37 38
38SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) 39SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl )
39 : SSHKeysBase( parent, name, fl ) 40 : SSHKeysBase( parent, name, fl )
@@ -44,13 +45,13 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl )
44 connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); 45 connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton()));
45 connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); 46 connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
46 connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); 47 connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
47 48
48 connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)), 49 connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
49 this, SLOT(log_sshadd_output(OProcess*,char*,int))); 50 this, SLOT(log_sshadd_output(OProcess*,char*,int)));
50 connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)), 51 connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
51 this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); 52 this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
52 connect(&addprocess, SIGNAL(processExited(OProcess*)), 53 connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)),
53 this, SLOT(ssh_add_exited(OProcess*))); 54 this, SLOT(ssh_add_exited(OProcess*)));
54 55
55 connect(KeyFileName, SIGNAL(textChanged(const QString&)), 56 connect(KeyFileName, SIGNAL(textChanged(const QString&)),
56 this, SLOT(add_text_changed(const QString&))); 57 this, SLOT(add_text_changed(const QString&)));
@@ -85,11 +86,11 @@ void SSHKeysApp::doRefreshListButton()
85 delete(t); 86 delete(t);
86 t = next; 87 t = next;
87 } 88 }
88 89
89 connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), 90 connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
90 this, SLOT(get_list_keys_output(OProcess*,char*,int))); 91 this, SLOT(get_list_keys_output(OProcess*,char*,int)));
91 connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), 92 connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
92 this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); 93 this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
93 94
94 keystate = KeySize; 95 keystate = KeySize;
95 incoming_keyname=""; 96 incoming_keyname="";
@@ -276,11 +277,11 @@ void SSHKeysApp::log_text(const char *text)
276void SSHKeysApp::doRemoveAllButton() 277void SSHKeysApp::doRemoveAllButton()
277{ 278{
278 OProcess sshadd_process; 279 OProcess sshadd_process;
279 280
280 connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), 281 connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
281 this, SLOT(log_sshadd_output(OProcess*,char*,int))); 282 this, SLOT(log_sshadd_output(OProcess*,char*,int)));
282 connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), 283 connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
283 this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); 284 this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
284 285
285// log_text(tr("Running ssh-add -D")); 286// log_text(tr("Running ssh-add -D"));
286 sshadd_process << "ssh-add" << "-D"; 287 sshadd_process << "ssh-add" << "-D";
diff --git a/noncore/settings/sshkeys/sshkeys.h b/noncore/settings/sshkeys/sshkeys.h
index 7483bbc..519f540 100644
--- a/noncore/settings/sshkeys/sshkeys.h
+++ b/noncore/settings/sshkeys/sshkeys.h
@@ -42,20 +42,20 @@ class SSHKeysApp : public SSHKeysBase
42 QString incoming_keyname; 42 QString incoming_keyname;
43 QString incoming_keysize; 43 QString incoming_keysize;
44 QString incoming_keyfingerprint; 44 QString incoming_keyfingerprint;
45 QString incoming_noise; 45 QString incoming_noise;
46 OProcess addprocess; 46 Opie::Core::OProcess addprocess;
47 QString pending_stdout; 47 QString pending_stdout;
48 QString pending_stderr; 48 QString pending_stderr;
49 49
50 private slots: 50 private slots:
51 void doAddButton(); 51 void doAddButton();
52 void doRefreshListButton(); 52 void doRefreshListButton();
53 void doRemoveAllButton(); 53 void doRemoveAllButton();
54 void get_list_keys_output(OProcess *proc, char *buffer, int buflen); 54 void get_list_keys_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
55 void log_sshadd_output(OProcess *proc, char *buffer, int buflen); 55 void log_sshadd_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
56 void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen); 56 void log_sshadd_stderr(Opie::Core::OProcess *proc, char *buffer, int buflen);
57 void ssh_add_exited(OProcess *proc); 57 void ssh_add_exited(Opie::Core::OProcess *proc);
58 void add_text_changed(const QString &text); 58 void add_text_changed(const QString &text);
59}; 59};
60#endif 60#endif
61 61
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp
index 3c2c15f..2a52b00 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.cpp
+++ b/noncore/settings/sysinfo/benchmarkinfo.cpp
@@ -50,9 +50,12 @@
50#if defined (__GNUC__) && (__GNUC__ < 3) 50#if defined (__GNUC__) && (__GNUC__ < 3)
51extern double round(double); 51extern double round(double);
52#endif 52#endif
53 53
54using namespace Opie::Ui;
55using namespace Opie::Core;
54extern "C" 56extern "C"
57
55{ 58{
56 void BenchFFT( void ); 59 void BenchFFT( void );
57 double dhry_main( int ); 60 double dhry_main( int );
58} 61}
@@ -174,14 +177,14 @@ void BenchmarkInfo::machineActivated( int index )
174 return; 177 return;
175 } 178 }
176 QStringList::Iterator it = results->begin(); 179 QStringList::Iterator it = results->begin();
177 test_alu->setText( 2, *(it++) ); 180 test_alu->setText( 2, *(it++) );
178 test_fpu->setText( 2, *(it++) ); 181 test_fpu->setText( 2, *(it++) );
179 test_txt->setText( 2, *(it++) ); 182 test_txt->setText( 2, *(it++) );
180 test_gfx->setText( 2, *(it++) ); 183 test_gfx->setText( 2, *(it++) );
181 test_ram->setText( 2, *(it++) ); 184 test_ram->setText( 2, *(it++) );
182 test_sd->setText( 2, *(it++) ); 185 test_sd->setText( 2, *(it++) );
183 test_cf->setText( 2, *(it++) ); 186 test_cf->setText( 2, *(it++) );
184} 187}
185 188
186 189
187void BenchmarkInfo::run() 190void BenchmarkInfo::run()
@@ -258,9 +261,9 @@ int BenchmarkInfo::textRendering( int seconds )
258 261
259 BenchmarkPaintWidget bpw; 262 BenchmarkPaintWidget bpw;
260 263
261 int loops = 0; 264 int loops = 0;
262 265
263 while ( t.elapsed() < stop ) 266 while ( t.elapsed() < stop )
264 { 267 {
265 int k = rand() % 9; 268 int k = rand() % 9;
266 int s = rand() % 100; 269 int s = rand() % 100;
@@ -268,9 +271,9 @@ int BenchmarkInfo::textRendering( int seconds )
268 bpw.p.setFont( QFont( "Vera", s ) ); 271 bpw.p.setFont( QFont( "Vera", s ) );
269 bpw.p.drawText( rand() % w, rand() % h, text, text.length() ); 272 bpw.p.drawText( rand() % w, rand() % h, text, text.length() );
270 ++loops; 273 ++loops;
271 } 274 }
272 275
273 return loops * text.length(); 276 return loops * text.length();
274} 277}
275 278
276int BenchmarkInfo::gfxRendering( int seconds ) 279int BenchmarkInfo::gfxRendering( int seconds )
@@ -289,9 +292,9 @@ int BenchmarkInfo::gfxRendering( int seconds )
289 QTime t; 292 QTime t;
290 t.start(); 293 t.start();
291 int stop = t.elapsed() + seconds*1000; 294 int stop = t.elapsed() + seconds*1000;
292 int loops = 0; 295 int loops = 0;
293 296
294 while ( t.elapsed() < stop ) 297 while ( t.elapsed() < stop )
295 { 298 {
296 int k = rand() % 9; 299 int k = rand() % 9;
297 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); 300 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
@@ -300,9 +303,9 @@ int BenchmarkInfo::gfxRendering( int seconds )
300 } 303 }
301 304
302 t.restart(); 305 t.restart();
303 stop = t.elapsed() + seconds*1000; 306 stop = t.elapsed() + seconds*1000;
304 307
305 while ( t.elapsed() < stop ) 308 while ( t.elapsed() < stop )
306 { 309 {
307 int k = rand() % 9; 310 int k = rand() % 9;
308 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); 311 bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
@@ -313,9 +316,9 @@ int BenchmarkInfo::gfxRendering( int seconds )
313 QBrush br1; 316 QBrush br1;
314 br1.setStyle( SolidPattern ); 317 br1.setStyle( SolidPattern );
315 t.restart(); 318 t.restart();
316 stop = t.elapsed() + seconds*1000; 319 stop = t.elapsed() + seconds*1000;
317 320
318 while ( t.elapsed() < stop ) 321 while ( t.elapsed() < stop )
319 { 322 {
320 int k = rand() % 9; 323 int k = rand() % 9;
321 br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); 324 br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
@@ -325,17 +328,17 @@ int BenchmarkInfo::gfxRendering( int seconds )
325 328
326 QPixmap p = Resource::loadPixmap( "sysinfo/pattern" ); 329 QPixmap p = Resource::loadPixmap( "sysinfo/pattern" );
327 t.restart(); 330 t.restart();
328 stop = t.elapsed() + seconds*1000; 331 stop = t.elapsed() + seconds*1000;
329 332
330 while ( t.elapsed() < stop ) 333 while ( t.elapsed() < stop )
331 { 334 {
332 bpw.p.drawPixmap( rand()%w, rand()%h, p ); 335 bpw.p.drawPixmap( rand()%w, rand()%h, p );
333 ++loops; 336 ++loops;
334 } 337 }
335 338
336 return loops; 339 return loops;
337 340
338} 341}
339 342
340void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item ) 343void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item )
341{ 344{
diff --git a/noncore/settings/sysinfo/benchmarkinfo.h b/noncore/settings/sysinfo/benchmarkinfo.h
index c3d44ec..0a61134 100644
--- a/noncore/settings/sysinfo/benchmarkinfo.h
+++ b/noncore/settings/sysinfo/benchmarkinfo.h
@@ -22,11 +22,11 @@
22#include <qstringlist.h> 22#include <qstringlist.h>
23 23
24class QClipboard; 24class QClipboard;
25class QComboBox; 25class QComboBox;
26class OCheckListItem; 26namespace Opie {namespace Ui {class OCheckListItem;}}
27class QPushButton; 27class QPushButton;
28class OListView; 28namespace Opie {namespace Ui {class OListView;}}
29 29
30class BenchmarkInfo : public QWidget 30class BenchmarkInfo : public QWidget
31{ 31{
32 Q_OBJECT 32 Q_OBJECT
@@ -34,15 +34,15 @@ class BenchmarkInfo : public QWidget
34public: 34public:
35 BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 ); 35 BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 );
36 ~BenchmarkInfo(); 36 ~BenchmarkInfo();
37 37
38 OCheckListItem* test_alu; 38 Opie::Ui::OCheckListItem* test_alu;
39 OCheckListItem* test_fpu; 39 Opie::Ui::OCheckListItem* test_fpu;
40 OCheckListItem* test_txt; 40 Opie::Ui::OCheckListItem* test_txt;
41 OCheckListItem* test_gfx; 41 Opie::Ui::OCheckListItem* test_gfx;
42 OCheckListItem* test_ram; 42 Opie::Ui::OCheckListItem* test_ram;
43 OCheckListItem* test_sd; 43 Opie::Ui::OCheckListItem* test_sd;
44 OCheckListItem* test_cf; 44 Opie::Ui::OCheckListItem* test_cf;
45 45
46 bool main_rd; 46 bool main_rd;
47 bool main_wt; 47 bool main_wt;
48 bool sd_rd; 48 bool sd_rd;
@@ -51,15 +51,15 @@ public:
51 bool cf_wt; 51 bool cf_wt;
52 52
53 QClipboard* clb; 53 QClipboard* clb;
54 QComboBox* machineCombo; 54 QComboBox* machineCombo;
55 OListView* tests; 55 Opie::Ui::OListView* tests;
56 QPushButton* startButton; 56 QPushButton* startButton;
57 QDict <QStringList> machines; 57 QDict <QStringList> machines;
58 58
59 int textRendering( int ); 59 int textRendering( int );
60 int gfxRendering( int ); 60 int gfxRendering( int );
61 void performFileTest( const QString& fname, OCheckListItem* item ); 61 void performFileTest( const QString& fname, Opie::Ui::OCheckListItem* item );
62 62
63private slots: 63private slots:
64 bool writeFile( const QString& ); 64 bool writeFile( const QString& );
65 bool readFile( const QString& ); 65 bool readFile( const QString& );
diff --git a/noncore/settings/sysinfo/main.cpp b/noncore/settings/sysinfo/main.cpp
index 3a7b1b1..8ebac20 100644
--- a/noncore/settings/sysinfo/main.cpp
+++ b/noncore/settings/sysinfo/main.cpp
@@ -22,5 +22,6 @@
22 22
23#include <opie2/oapplicationfactory.h> 23#include <opie2/oapplicationfactory.h>
24 24
25 25
26using namespace Opie::Core;
26OPIE_EXPORT_APP( OApplicationFactory<SystemInfo> ) 27OPIE_EXPORT_APP( OApplicationFactory<SystemInfo> )
diff --git a/noncore/settings/sysinfo/modulesinfo.cpp b/noncore/settings/sysinfo/modulesinfo.cpp
index dfe48e1..71cefcb 100644
--- a/noncore/settings/sysinfo/modulesinfo.cpp
+++ b/noncore/settings/sysinfo/modulesinfo.cpp
@@ -35,8 +35,9 @@
35#include <qtextview.h> 35#include <qtextview.h>
36#include <qtimer.h> 36#include <qtimer.h>
37#include <qwhatsthis.h> 37#include <qwhatsthis.h>
38 38
39using namespace Opie::Ui;
39ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) 40ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
40 : QWidget( parent, name, fl ) 41 : QWidget( parent, name, fl )
41{ 42{
42 QGridLayout *layout = new QGridLayout( this ); 43 QGridLayout *layout = new QGridLayout( this );
@@ -57,10 +58,10 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
57 // Test if we have /sbin/modinfo, and if so, allow module detail window 58 // Test if we have /sbin/modinfo, and if so, allow module detail window
58 if ( QFile::exists( "/sbin/modinfo" ) ) 59 if ( QFile::exists( "/sbin/modinfo" ) )
59 { 60 {
60 QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold ); 61 QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
61 connect( ModulesView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ), 62 connect( ModulesView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
62 this, SLOT( viewModules(OListViewItem*) ) ); 63 this, SLOT( viewModules(QListViewItem*) ) );
63 } 64 }
64 65
65 CommandCB = new QComboBox( FALSE, this ); 66 CommandCB = new QComboBox( FALSE, this );
66 CommandCB->insertItem( "modprobe -r" ); 67 CommandCB->insertItem( "modprobe -r" );
@@ -162,8 +163,13 @@ void ModulesInfo::slotSendClicked()
162 } 163 }
163 164
164} 165}
165 166
167void ModulesInfo::viewModules( QListViewItem *module ) {
168 if ( !module )
169 return;
170 viewModules( static_cast<OListViewItem*>( module ) );
171}
166void ModulesInfo::viewModules( OListViewItem *modules ) 172void ModulesInfo::viewModules( OListViewItem *modules )
167{ 173{
168 QString modname = modules->text( 0 ); 174 QString modname = modules->text( 0 );
169 QString capstr = "Module: "; 175 QString capstr = "Module: ";
diff --git a/noncore/settings/sysinfo/modulesinfo.h b/noncore/settings/sysinfo/modulesinfo.h
index 78dce73..b816b41 100644
--- a/noncore/settings/sysinfo/modulesinfo.h
+++ b/noncore/settings/sysinfo/modulesinfo.h
@@ -25,10 +25,11 @@
25#include <qwidget.h> 25#include <qwidget.h>
26 26
27class Detail; 27class Detail;
28class QComboBox; 28class QComboBox;
29class OListView; 29class QListViewItem;
30class OListViewItem; 30namespace Opie {namespace Ui {class OListView;}}
31namespace Opie {namespace Ui {class OListViewItem;}}
31 32
32class ModulesInfo : public QWidget 33class ModulesInfo : public QWidget
33{ 34{
34 Q_OBJECT 35 Q_OBJECT
@@ -36,16 +37,17 @@ public:
36 ModulesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 37 ModulesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
37 ~ModulesInfo(); 38 ~ModulesInfo();
38 39
39private: 40private:
40 OListView* ModulesView; 41 Opie::Ui::OListView* ModulesView;
41 QComboBox* CommandCB; 42 QComboBox* CommandCB;
42 43
43 Detail* ModulesDtl; 44 Detail* ModulesDtl;
44 45
45private slots: 46private slots:
46 void updateData(); 47 void updateData();
47 void slotSendClicked(); 48 void slotSendClicked();
48 void viewModules( OListViewItem * ); 49 void viewModules( QListViewItem* );
50 void viewModules( Opie::Ui::OListViewItem * );
49}; 51};
50 52
51#endif 53#endif
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp
index dd9a05d..e887267 100644
--- a/noncore/settings/sysinfo/processinfo.cpp
+++ b/noncore/settings/sysinfo/processinfo.cpp
@@ -37,8 +37,9 @@
37/* STD */ 37/* STD */
38#include <sys/types.h> 38#include <sys/types.h>
39#include <signal.h> 39#include <signal.h>
40 40
41using namespace Opie::Ui;
41ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl ) 42ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
42 : QWidget( parent, name, fl ) 43 : QWidget( parent, name, fl )
43{ 44{
44 QGridLayout *layout = new QGridLayout( this ); 45 QGridLayout *layout = new QGridLayout( this );
@@ -54,10 +55,10 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
54 colnum = ProcessView->addColumn( tr( "Time" ) ); 55 colnum = ProcessView->addColumn( tr( "Time" ) );
55 ProcessView->setColumnAlignment( colnum, Qt::AlignRight ); 56 ProcessView->setColumnAlignment( colnum, Qt::AlignRight );
56 ProcessView->setAllColumnsShowFocus( TRUE ); 57 ProcessView->setAllColumnsShowFocus( TRUE );
57 QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold ); 58 QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
58 connect( ProcessView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ), 59 connect( ProcessView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
59 this, SLOT( viewProcess(OListViewItem*) ) ); 60 this, SLOT( viewProcess(QListViewItem*) ) );
60 layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 ); 61 layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 );
61 QWhatsThis::add( ProcessView, tr( "This is a list of all the processes on this handheld device.\n\nClick and hold on a process to see additional information about the process, or to send a signal to it." ) ); 62 QWhatsThis::add( ProcessView, tr( "This is a list of all the processes on this handheld device.\n\nClick and hold on a process to see additional information about the process, or to send a signal to it." ) );
62 63
63 SignalCB = new QComboBox( FALSE, this, "SignalCB" ); 64 SignalCB = new QComboBox( FALSE, this, "SignalCB" );
@@ -184,8 +185,14 @@ void ProcessInfo::slotSendClicked()
184 } 185 }
185 186
186} 187}
187 188
189void ProcessInfo::viewProcess( QListViewItem* process ) {
190 if ( !process )
191 return;
192 viewProcess( static_cast<OListViewItem*>( process ) );
193}
194
188void ProcessInfo::viewProcess( OListViewItem *process ) 195void ProcessInfo::viewProcess( OListViewItem *process )
189{ 196{
190 QString pid= process->text( 0 ).stripWhiteSpace(); 197 QString pid= process->text( 0 ).stripWhiteSpace();
191 QString command = process->text( 1 ); 198 QString command = process->text( 1 );
diff --git a/noncore/settings/sysinfo/processinfo.h b/noncore/settings/sysinfo/processinfo.h
index 6e7acd5..0a1682b 100644
--- a/noncore/settings/sysinfo/processinfo.h
+++ b/noncore/settings/sysinfo/processinfo.h
@@ -23,10 +23,11 @@
23#include <qwidget.h> 23#include <qwidget.h>
24 24
25class Detail; 25class Detail;
26class QComboBox; 26class QComboBox;
27class OListView; 27class QListViewItem;
28class OListViewItem; 28namespace Opie {namespace Ui {class OListView;}}
29namespace Opie {namespace Ui {class OListViewItem;}}
29 30
30class ProcessInfo : public QWidget 31class ProcessInfo : public QWidget
31{ 32{
32 Q_OBJECT 33 Q_OBJECT
@@ -34,17 +35,18 @@ public:
34 ProcessInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); 35 ProcessInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
35 ~ProcessInfo(); 36 ~ProcessInfo();
36 37
37private: 38private:
38 OListView* ProcessView; 39 Opie::Ui::OListView* ProcessView;
39 QComboBox* SignalCB; 40 QComboBox* SignalCB;
40 QPushButton* SendButton; 41 QPushButton* SendButton;
41 42
42 Detail *ProcessDtl; 43 Detail *ProcessDtl;
43 44
44private slots: 45private slots:
45 void updateData(); 46 void updateData();
46 void slotSendClicked(); 47 void slotSendClicked();
47 void viewProcess( OListViewItem * ); 48 void viewProcess( QListViewItem* );
49 void viewProcess( Opie::Ui::OListViewItem * );
48}; 50};
49 51
50#endif 52#endif
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp
index fda6352..4c58999 100644
--- a/noncore/settings/sysinfo/sysinfo.cpp
+++ b/noncore/settings/sysinfo/sysinfo.cpp
@@ -37,8 +37,9 @@
37#include <qpe/resource.h> 37#include <qpe/resource.h>
38 38
39#include <qlayout.h> 39#include <qlayout.h>
40 40
41using namespace Opie::Ui;
41SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) 42SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
42 : QWidget( parent, name, WStyle_ContextHelp ) 43 : QWidget( parent, name, WStyle_ContextHelp )
43{ 44{
44 setIcon( Resource::loadPixmap( "system_icon" ) ); 45 setIcon( Resource::loadPixmap( "system_icon" ) );
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 4bebd06..6764aa6 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -32,9 +32,9 @@
32#include <qscrollview.h> 32#include <qscrollview.h>
33#include <qtextstream.h> 33#include <qtextstream.h>
34#include <qwhatsthis.h> 34#include <qwhatsthis.h>
35 35
36using namespace Opie; 36using namespace Opie::Core;
37 37
38VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) 38VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
39 : QWidget( parent, name, f ) 39 : QWidget( parent, name, f )
40{ 40{
diff --git a/noncore/settings/usermanager/main.cpp b/noncore/settings/usermanager/main.cpp
index d7147d1..807d528 100644
--- a/noncore/settings/usermanager/main.cpp
+++ b/noncore/settings/usermanager/main.cpp
@@ -10,5 +10,6 @@
10#include "usermanager.h" 10#include "usermanager.h"
11 11
12#include <opie2/oapplicationfactory.h> 12#include <opie2/oapplicationfactory.h>
13 13
14using namespace Opie::Core;
14OPIE_EXPORT_APP( OApplicationFactory<UserConfig> ) 15OPIE_EXPORT_APP( OApplicationFactory<UserConfig> )
diff --git a/noncore/settings/usermanager/userdialog.cpp b/noncore/settings/usermanager/userdialog.cpp
index eb9a289..5854fe0 100644
--- a/noncore/settings/usermanager/userdialog.cpp
+++ b/noncore/settings/usermanager/userdialog.cpp
@@ -26,15 +26,16 @@
26#include <unistd.h> 26#include <unistd.h>
27#include <signal.h> 27#include <signal.h>
28 28
29 29
30using namespace Opie; 30using namespace Opie::Core;
31 31
32 32
33/** 33/**
34 * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups. 34 * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups.
35 * 35 *
36 */ 36 */
37using namespace Opie::Ui;
37UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) 38UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl)
38{ 39{
39 vm=viewmode; 40 vm=viewmode;
40 QVBoxLayout *layout = new QVBoxLayout(this); 41 QVBoxLayout *layout = new QVBoxLayout(this);