summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -57,6 +57,7 @@
#include "utils.h"
#include "global.h"
+using namespace Opie::Ui;
enum {
MAXLINES = 100,
};
@@ -233,7 +234,7 @@ void InstallDlgImpl :: optionsSelected()
text << "*";
map.insert( tr( "All" ), text );
- QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+ QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
if( !filename.isEmpty() )
{
QString currentFileName = QFileInfo( filename ).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
@@ -42,6 +42,7 @@
#include "ipkg.h"
#include "global.h"
+using namespace Opie::Core;
Ipkg :: Ipkg()
{
proc = 0;
@@ -288,13 +289,13 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
// Connect up our slots
- connect(proc, SIGNAL(processExited(OProcess*)),
+ connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)),
this, SLOT( processFinished()));
- connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)),
+ connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
this, SLOT(commandStdout(OProcess*,char*,int)));
- connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)),
+ connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
this, SLOT(commandStderr(OProcess*,char*,int)));
for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it )
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
@@ -47,7 +47,7 @@
#define MAKE_LINKS 0x0010
#define VERBOSE_WGET 0x0020
-class OProcess;
+namespace Opie {namespace Core {class OProcess;}}
class Ipkg : public QObject
{
@@ -70,8 +70,8 @@ signals:
void ipkgFinished();
public slots:
- void commandStdout(OProcess*, char *buffer, int buflen);
- void commandStderr(OProcess*, char *buffer, int buflen);
+ void commandStdout(Opie::Core::OProcess*, char *buffer, int buflen);
+ void commandStderr(Opie::Core::OProcess*, char *buffer, int buflen);
void processFinished();
void abort();
@@ -85,7 +85,7 @@ private:
QString destination;
QString destDir;
QString runtimeDir;
- OProcess *proc;
+ Opie::Core::OProcess *proc;
int flags;
int infoLevel;
bool finished;
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
@@ -35,4 +35,5 @@
extern QString LOCAL_SERVER;
extern QString LOCAL_IPKGS;
+using namespace Opie::Core;
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
@@ -52,6 +52,8 @@
#include <algorithm>
using namespace std;
+using namespace Opie::Ui;
+using namespace Opie::Ui;
SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl )
: QDialog( parent, name, modal, fl )
{
@@ -63,7 +65,7 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const
layout->setSpacing( 4 );
// Setup tabs for all info
- Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this );
+ OTabWidget *tabwidget = new OTabWidget( this );
layout->addWidget( tabwidget );
tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) );
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
@@ -4,5 +4,6 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<BackupAndRestore> )
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
@@ -22,4 +22,5 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_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
@@ -22,4 +22,5 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_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
@@ -4,5 +4,6 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MediumMountSetting::MainWindow> )
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
@@ -30,4 +30,5 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_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
@@ -48,6 +48,8 @@
#include <qstring.h>
#include <qtimer.h>
+using namespace Opie::Ui;
+using namespace Opie::Core;
MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f )
: QDialog( 0x0, 0x0, TRUE, 0 )
{
@@ -188,9 +190,9 @@ void MainWindow::runNTP()
if ( !ntpProcess )
{
ntpProcess = new OProcess();
- connect( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)),
+ connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
this, SLOT(slotNtpOutput(OProcess*,char*,int)) );
- connect( ntpProcess, SIGNAL(processExited(OProcess*)),
+ connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)),
this, SLOT(slotNtpFinished(OProcess*)) );
}
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
@@ -40,7 +40,6 @@ class SettingsTabWidget;
class NTPTabWidget;
class PredictTabWidget;
-using Opie::OTabWidget;
class QDateTime;
class QSocket;
@@ -60,7 +59,7 @@ protected:
void reject();
private:
- OTabWidget *mainWidget;
+ Opie::Ui::OTabWidget *mainWidget;
TimeTabWidget *timeTab;
FormatTabWidget *formatTab;
@@ -71,7 +70,7 @@ private:
bool ntpTabEnabled;
bool predictTabEnabled;
- OProcess *ntpProcess;
+ Opie::Core::OProcess *ntpProcess;
QTimer *ntpTimer;
QSocket *ntpSock;
int ntpDelay;
@@ -90,8 +89,8 @@ private slots:
void slotGetNTPTime();
void slotTimerGetNTPTime();
void slotProbeNTPServer();
- void slotNtpOutput( OProcess *, char *, int );
- void slotNtpFinished( OProcess* );
+ void slotNtpOutput( Opie::Core::OProcess *, char *, int );
+ void slotNtpFinished( Opie::Core::OProcess* );
void slotNTPDelayChanged( int );
void slotCheckNtp( int );
};
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
@@ -22,6 +22,8 @@
/**
* Constuctor. Set up the connection. A profile must be set.
*/
+using namespace Opie::Ui;
+using namespace Opie::Core;
InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){
if (j == 0) {
delInterfaces = true;
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 @@
#include "mainwindowimp.h"
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> )
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,7 +1,7 @@
CONFIG = qt warn_on debug quick-app
HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h
SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp
-INCLUDEPATH += $(OPIEDIR)/include interfaces/
+INCLUDEPATH += $(OPIEDIR)/include interfaces/ .
DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/
LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2
INTERFACES = mainwindow.ui addconnection.ui
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
@@ -25,6 +25,7 @@
/**
* Constructor, read in the wireless.opts file for parsing later.
*/
+using namespace Opie::Core;
WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") {
interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i);
tabWidget->insertTab(interfaceSetup, "TCP/IP");
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
@@ -42,6 +42,8 @@
/**
* Constructor, read in the wireless.opts file for parsing later.
*/
+using namespace Opie::Net;
+using namespace Opie::Core;
WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") {
interfaces = new Interfaces();
interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces);
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
@@ -9,7 +9,7 @@
class InterfaceSetupImp;
class Interface;
class Config;
-class OPacket;
+namespace Opie {namespace Net {class OPacket;}}
class QListViewItem;
const int col_mode= 0;
@@ -38,8 +38,8 @@ private:
void parseKeyStr(QString keystr);
- void handlePacket( OPacket* );
- void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const OMacAddress& mac );
+ void handlePacket( Opie::Net::OPacket* );
+ void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const Opie::Net::OMacAddress& mac );
InterfaceSetupImp *interfaceSetup;
Interfaces *interfaces;
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
@@ -49,6 +49,7 @@
#include "opackagemanager.h"
+using namespace Opie::Ui;
InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo,
OPackage::Command command1, QStringList *packages1,
OPackage::Command command2, QStringList *packages2,
@@ -275,7 +276,7 @@ void InstallDlg::slotBtnOptions()
text << "*";
map.insert( tr( "All" ), text );
- QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
+ QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map );
if( !filename.isEmpty() )
{
QString currentFileName = QFileInfo( filename ).fileName();
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
@@ -31,4 +31,5 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_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
@@ -42,6 +42,7 @@
#include <qpe/resource.h>
+using namespace Opie::Ui;
OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
: QDialog( parent, QString::null, true )
, m_ipkg( ipkg )
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
@@ -74,7 +74,7 @@ private:
// UI controls
QVBoxLayout m_layout; // Main dialog layout control
- OTabWidget m_tabWidget; // Main tab widget control
+ Opie::Ui::OTabWidget m_tabWidget; // Main tab widget control
QWidget *m_serverWidget; // Widget containing server configuration controls
QWidget *m_destWidget; // Widget containing destination configuration controls
QWidget *m_proxyWidget; // Widget containing proxy 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
@@ -38,6 +38,7 @@
#include <opie2/otabwidget.h>
+using namespace Opie::Ui;
PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
: QWidget( 0x0 )
, m_packman( pm )
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
@@ -22,6 +22,7 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> )
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
@@ -33,6 +33,7 @@
#include <stdio.h>
#include <ctype.h>
+using namespace Opie::Core;
static char *keynames[] = { "identity", "id_rsa", "id_dsa" };
SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl )
@@ -45,11 +46,11 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl )
connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton()));
connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton()));
- connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)),
+ connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
this, SLOT(log_sshadd_output(OProcess*,char*,int)));
- connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)),
+ connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
- connect(&addprocess, SIGNAL(processExited(OProcess*)),
+ connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)),
this, SLOT(ssh_add_exited(OProcess*)));
connect(KeyFileName, SIGNAL(textChanged(const QString&)),
@@ -86,9 +87,9 @@ void SSHKeysApp::doRefreshListButton()
t = next;
}
- connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
+ connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
this, SLOT(get_list_keys_output(OProcess*,char*,int)));
- connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
+ connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
keystate = KeySize;
@@ -277,9 +278,9 @@ void SSHKeysApp::doRemoveAllButton()
{
OProcess sshadd_process;
- connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)),
+ connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
this, SLOT(log_sshadd_output(OProcess*,char*,int)));
- connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)),
+ connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
this, SLOT(log_sshadd_stderr(OProcess*,char*,int)));
// log_text(tr("Running 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
@@ -43,7 +43,7 @@ class SSHKeysApp : public SSHKeysBase
QString incoming_keysize;
QString incoming_keyfingerprint;
QString incoming_noise;
- OProcess addprocess;
+ Opie::Core::OProcess addprocess;
QString pending_stdout;
QString pending_stderr;
@@ -51,10 +51,10 @@ class SSHKeysApp : public SSHKeysBase
void doAddButton();
void doRefreshListButton();
void doRemoveAllButton();
- void get_list_keys_output(OProcess *proc, char *buffer, int buflen);
- void log_sshadd_output(OProcess *proc, char *buffer, int buflen);
- void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen);
- void ssh_add_exited(OProcess *proc);
+ void get_list_keys_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
+ void log_sshadd_output(Opie::Core::OProcess *proc, char *buffer, int buflen);
+ void log_sshadd_stderr(Opie::Core::OProcess *proc, char *buffer, int buflen);
+ void ssh_add_exited(Opie::Core::OProcess *proc);
void add_text_changed(const QString &text);
};
#endif
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
@@ -51,7 +51,10 @@
extern double round(double);
#endif
+using namespace Opie::Ui;
+using namespace Opie::Core;
extern "C"
+
{
void BenchFFT( void );
double dhry_main( int );
@@ -175,12 +178,12 @@ void BenchmarkInfo::machineActivated( int index )
}
QStringList::Iterator it = results->begin();
test_alu->setText( 2, *(it++) );
- test_fpu->setText( 2, *(it++) );
+ test_fpu->setText( 2, *(it++) );
test_txt->setText( 2, *(it++) );
test_gfx->setText( 2, *(it++) );
test_ram->setText( 2, *(it++) );
test_sd->setText( 2, *(it++) );
- test_cf->setText( 2, *(it++) );
+ test_cf->setText( 2, *(it++) );
}
@@ -259,7 +262,7 @@ int BenchmarkInfo::textRendering( int seconds )
BenchmarkPaintWidget bpw;
int loops = 0;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
@@ -269,7 +272,7 @@ int BenchmarkInfo::textRendering( int seconds )
bpw.p.drawText( rand() % w, rand() % h, text, text.length() );
++loops;
}
-
+
return loops * text.length();
}
@@ -290,7 +293,7 @@ int BenchmarkInfo::gfxRendering( int seconds )
t.start();
int stop = t.elapsed() + seconds*1000;
int loops = 0;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
@@ -301,7 +304,7 @@ int BenchmarkInfo::gfxRendering( int seconds )
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
@@ -314,7 +317,7 @@ int BenchmarkInfo::gfxRendering( int seconds )
br1.setStyle( SolidPattern );
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
@@ -326,7 +329,7 @@ int BenchmarkInfo::gfxRendering( int seconds )
QPixmap p = Resource::loadPixmap( "sysinfo/pattern" );
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
bpw.p.drawPixmap( rand()%w, rand()%h, p );
@@ -334,7 +337,7 @@ int BenchmarkInfo::gfxRendering( int seconds )
}
return loops;
-
+
}
void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item )
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
@@ -23,9 +23,9 @@
class QClipboard;
class QComboBox;
-class OCheckListItem;
+namespace Opie {namespace Ui {class OCheckListItem;}}
class QPushButton;
-class OListView;
+namespace Opie {namespace Ui {class OListView;}}
class BenchmarkInfo : public QWidget
{
@@ -35,13 +35,13 @@ public:
BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 );
~BenchmarkInfo();
- OCheckListItem* test_alu;
- OCheckListItem* test_fpu;
- OCheckListItem* test_txt;
- OCheckListItem* test_gfx;
- OCheckListItem* test_ram;
- OCheckListItem* test_sd;
- OCheckListItem* test_cf;
+ Opie::Ui::OCheckListItem* test_alu;
+ Opie::Ui::OCheckListItem* test_fpu;
+ Opie::Ui::OCheckListItem* test_txt;
+ Opie::Ui::OCheckListItem* test_gfx;
+ Opie::Ui::OCheckListItem* test_ram;
+ Opie::Ui::OCheckListItem* test_sd;
+ Opie::Ui::OCheckListItem* test_cf;
bool main_rd;
bool main_wt;
@@ -52,13 +52,13 @@ public:
QClipboard* clb;
QComboBox* machineCombo;
- OListView* tests;
+ Opie::Ui::OListView* tests;
QPushButton* startButton;
QDict <QStringList> machines;
int textRendering( int );
int gfxRendering( int );
- void performFileTest( const QString& fname, OCheckListItem* item );
+ void performFileTest( const QString& fname, Opie::Ui::OCheckListItem* item );
private slots:
bool writeFile( 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
@@ -23,4 +23,5 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_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
@@ -36,6 +36,7 @@
#include <qtimer.h>
#include <qwhatsthis.h>
+using namespace Opie::Ui;
ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
@@ -58,8 +59,8 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
if ( QFile::exists( "/sbin/modinfo" ) )
{
QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold );
- connect( ModulesView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ),
- this, SLOT( viewModules(OListViewItem*) ) );
+ connect( ModulesView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
+ this, SLOT( viewModules(QListViewItem*) ) );
}
CommandCB = new QComboBox( FALSE, this );
@@ -163,6 +164,11 @@ void ModulesInfo::slotSendClicked()
}
+void ModulesInfo::viewModules( QListViewItem *module ) {
+ if ( !module )
+ return;
+ viewModules( static_cast<OListViewItem*>( module ) );
+}
void ModulesInfo::viewModules( OListViewItem *modules )
{
QString modname = modules->text( 0 );
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
@@ -26,8 +26,9 @@
class Detail;
class QComboBox;
-class OListView;
-class OListViewItem;
+class QListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
class ModulesInfo : public QWidget
{
@@ -37,7 +38,7 @@ public:
~ModulesInfo();
private:
- OListView* ModulesView;
+ Opie::Ui::OListView* ModulesView;
QComboBox* CommandCB;
Detail* ModulesDtl;
@@ -45,7 +46,8 @@ private:
private slots:
void updateData();
void slotSendClicked();
- void viewModules( OListViewItem * );
+ void viewModules( QListViewItem* );
+ void viewModules( Opie::Ui::OListViewItem * );
};
#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
@@ -38,6 +38,7 @@
#include <sys/types.h>
#include <signal.h>
+using namespace Opie::Ui;
ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
@@ -55,8 +56,8 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
ProcessView->setColumnAlignment( colnum, Qt::AlignRight );
ProcessView->setAllColumnsShowFocus( TRUE );
QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold );
- connect( ProcessView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ),
- this, SLOT( viewProcess(OListViewItem*) ) );
+ connect( ProcessView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ),
+ this, SLOT( viewProcess(QListViewItem*) ) );
layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 );
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." ) );
@@ -185,6 +186,12 @@ void ProcessInfo::slotSendClicked()
}
+void ProcessInfo::viewProcess( QListViewItem* process ) {
+ if ( !process )
+ return;
+ viewProcess( static_cast<OListViewItem*>( process ) );
+}
+
void ProcessInfo::viewProcess( OListViewItem *process )
{
QString pid= process->text( 0 ).stripWhiteSpace();
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
@@ -24,8 +24,9 @@
class Detail;
class QComboBox;
-class OListView;
-class OListViewItem;
+class QListViewItem;
+namespace Opie {namespace Ui {class OListView;}}
+namespace Opie {namespace Ui {class OListViewItem;}}
class ProcessInfo : public QWidget
{
@@ -35,7 +36,7 @@ public:
~ProcessInfo();
private:
- OListView* ProcessView;
+ Opie::Ui::OListView* ProcessView;
QComboBox* SignalCB;
QPushButton* SendButton;
@@ -44,7 +45,8 @@ private:
private slots:
void updateData();
void slotSendClicked();
- void viewProcess( OListViewItem * );
+ void viewProcess( QListViewItem* );
+ void viewProcess( Opie::Ui::OListViewItem * );
};
#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
@@ -38,6 +38,7 @@
#include <qlayout.h>
+using namespace Opie::Ui;
SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
: QWidget( parent, name, WStyle_ContextHelp )
{
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
@@ -33,7 +33,7 @@
#include <qtextstream.h>
#include <qwhatsthis.h>
-using namespace Opie;
+using namespace Opie::Core;
VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
: QWidget( parent, name, f )
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
@@ -11,4 +11,5 @@
#include <opie2/oapplicationfactory.h>
+using namespace Opie::Core;
OPIE_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
@@ -27,13 +27,14 @@
#include <signal.h>
-using namespace Opie;
+using namespace Opie::Core;
/**
* UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups.
*
*/
+using namespace Opie::Ui;
UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl)
{
vm=viewmode;