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
@@ -54,12 +54,13 @@
#include "instoptionsimpl.h"
#include "installdlgimpl.h"
#include "ipkg.h"
#include "utils.h"
#include "global.h"
+using namespace Opie::Ui;
enum {
MAXLINES = 100,
};
InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title )
: QWidget( 0, 0, 0 )
@@ -230,13 +231,13 @@ void InstallDlgImpl :: optionsSelected()
QStringList text;
text << "text/*";
map.insert(tr( "Text" ), text );
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();
DocLnk doc;
doc.setType( "text/plain" );
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 @@
#include <qtextstream.h>
#include "utils.h"
#include "ipkg.h"
#include "global.h"
+using namespace Opie::Core;
Ipkg :: Ipkg()
{
proc = 0;
}
Ipkg :: ~Ipkg()
@@ -285,19 +286,19 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ )
// OK we're gonna use OProcess to run this thing
proc = new OProcess();
aborted = false;
// 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 )
{
*proc << (*it).latin1();
}
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 @@
#define FORCE_REMOVE 0x0002
#define FORCE_REINSTALL 0x0004
#define FORCE_OVERWRITE 0x0008
#define MAKE_LINKS 0x0010
#define VERBOSE_WGET 0x0020
-class OProcess;
+namespace Opie {namespace Core {class OProcess;}}
class Ipkg : public QObject
{
Q_OBJECT
public:
Ipkg();
@@ -67,14 +67,14 @@ public:
signals:
void outputText( const QString &text );
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();
private:
bool createLinks;
@@ -82,13 +82,13 @@ private:
bool error;
QString option;
QString package;
QString destination;
QString destDir;
QString runtimeDir;
- OProcess *proc;
+ Opie::Core::OProcess *proc;
int flags;
int infoLevel;
bool finished;
QList<QString> *dependantPackages;
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 @@
#include <opie2/oapplicationfactory.h>
/* be less intrusive for translation -zecke */
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
@@ -49,24 +49,26 @@
/* STD */
#include <fstream>
#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 )
{
setCaption( tr( "Configuration" ) );
// Setup layout to make everything pretty
QVBoxLayout *layout = new QVBoxLayout( this );
layout->setMargin( 2 );
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" ) );
tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) );
tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) );
tabwidget->setCurrentTab( 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
@@ -1,8 +1,9 @@
#include "backuprestore.h"
#include "qnetworkprotocol.h"
#include <qpe/qpeapplication.h>
#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
@@ -19,7 +19,8 @@
**********************************************************************/
#include "doctab.h"
#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
@@ -19,7 +19,8 @@
**********************************************************************/
#include "settings.h"
#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
@@ -1,8 +1,9 @@
#include "mediumwidget.h"
#include "mediumglobal.h"
#include "mainwindow.h"
#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
@@ -27,7 +27,8 @@
*/
#include "mainwindow.h"
#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
@@ -45,12 +45,14 @@
#include <qlayout.h>
#include <qmessagebox.h>
#include <qsocket.h>
#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 )
{
setCaption( tr( "SystemTime" ) );
QVBoxLayout *layout = new QVBoxLayout( this );
@@ -185,15 +187,15 @@ void MainWindow::runNTP()
ntpTab->addNtpOutput( output );
}
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*)) );
}
else
ntpProcess->clearArguments();
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
@@ -37,13 +37,12 @@
class TimeTabWidget;
class FormatTabWidget;
class SettingsTabWidget;
class NTPTabWidget;
class PredictTabWidget;
-using Opie::OTabWidget;
class QDateTime;
class QSocket;
class QTimer;
class MainWindow : public QDialog
@@ -57,24 +56,24 @@ public:
protected:
void accept();
void reject();
private:
- OTabWidget *mainWidget;
+ Opie::Ui::OTabWidget *mainWidget;
TimeTabWidget *timeTab;
FormatTabWidget *formatTab;
SettingsTabWidget *settingsTab;
NTPTabWidget *ntpTab;
PredictTabWidget *predictTab;
bool ntpTabEnabled;
bool predictTabEnabled;
- OProcess *ntpProcess;
+ Opie::Core::OProcess *ntpProcess;
QTimer *ntpTimer;
QSocket *ntpSock;
int ntpDelay;
bool ntpInteractive;
QString ntpOutput;
int _lookupDiff;
@@ -87,13 +86,13 @@ private slots:
void slotQCopReceive( const QCString &, const QByteArray & );
void slotDisplayNTPTab( bool );
void slotDisplayPredictTab( bool );
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 );
};
#endif
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
@@ -19,12 +19,14 @@
#define DNSSCRIPT "changedns"
/**
* 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;
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 @@
#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,10 +1,10 @@
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
TARGET = 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
@@ -22,12 +22,13 @@
#define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
/**
* 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");
// Read in the config file.
QString wlanFile = WIRELESS_OPTS;
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
@@ -39,12 +39,14 @@
#define WIRELESS_OPTS "/etc/pcmcia/wireless.opts"
#define PREUP "/etc/network/if-pre-up.d/wireless-tools"
/**
* 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);
tabWidget->insertTab(interfaceSetup, "TCP/IP");
// Check sanity - the existance of the wireless-tools if-pre-up script
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
@@ -6,13 +6,13 @@
#include <qstringlist.h>
#include <opie2/onetutils.h>
class InterfaceSetupImp;
class Interface;
class Config;
-class OPacket;
+namespace Opie {namespace Net {class OPacket;}}
class QListViewItem;
const int col_mode= 0;
const int col_ssid = 1;
const int col_chn = 2;
const int col_mac = 3;
@@ -35,14 +35,14 @@ protected:
private:
void parseOpts();
void writeOpts();
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;
Interface *interface;
QString currentProfile;
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
@@ -46,12 +46,13 @@
#include <qpe/storage.h>
#include <opie2/ofiledialog.h>
#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,
OPackage::Command command3, QStringList *packages3 )
: QWidget( 0x0 )
, m_packman( pm )
@@ -272,13 +273,13 @@ void InstallDlg::slotBtnOptions()
QStringList text;
text << "text/*";
map.insert(tr( "Text" ), text );
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();
DocLnk doc;
doc.setType( "text/plain" );
doc.setFile( 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
@@ -28,7 +28,8 @@
*/
#include "mainwindow.h"
#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
@@ -39,12 +39,13 @@
#include <qlistbox.h>
#include <qpushbutton.h>
#include <qscrollview.h>
#include <qpe/resource.h>
+using namespace Opie::Ui;
OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent )
: QDialog( parent, QString::null, true )
, m_ipkg( ipkg )
, m_configs( 0x0 )
, m_installOptions( installOptions )
, m_serverNew( false )
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
@@ -71,13 +71,13 @@ private:
bool m_destNew; // Indicates if destination information is for a new destination
int m_destCurrent; // Index of currently selected destination in m_destList
QString m_destCurrName; // Name of currently selected destination in m_destList
// 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
QWidget *m_optionsWidget; // Widget containing ipkg execution configuration controls
// Server configuration UI 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
@@ -35,12 +35,13 @@
#include <qpushbutton.h>
#include <qpe/resource.h>
#include <opie2/otabwidget.h>
+using namespace Opie::Ui;
PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package )
: QWidget( 0x0 )
, m_packman( pm )
, m_information( this )
, m_files( 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
@@ -19,10 +19,11 @@
**********************************************************************/
#include "soundsettings.h"
#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
@@ -30,29 +30,30 @@
#include <sys/stat.h>
#include <stdlib.h>
#include <unistd.h>
#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 )
: SSHKeysBase( parent, name, fl )
{
char *home = getenv("HOME");
unsigned i;
connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton()));
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&)),
this, SLOT(add_text_changed(const QString&)));
if (home) {
@@ -83,15 +84,15 @@ void SSHKeysApp::doRefreshListButton()
QListViewItem *next = t->nextSibling();
KeyList->takeItem(t);
delete(t);
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;
incoming_keyname="";
incoming_keysize="";
incoming_keyfingerprint="";
@@ -274,15 +275,15 @@ void SSHKeysApp::log_text(const char *text)
}
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"));
sshadd_process << "ssh-add" << "-D";
bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput);
if (!ret) {
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
@@ -40,22 +40,22 @@ class SSHKeysApp : public SSHKeysBase
enum { Noise, KeyName, KeySize, KeyFingerprint } keystate;
QString incoming_keyname;
QString incoming_keysize;
QString incoming_keyfingerprint;
QString incoming_noise;
- OProcess addprocess;
+ Opie::Core::OProcess addprocess;
QString pending_stdout;
QString pending_stderr;
private slots:
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
@@ -48,13 +48,16 @@
#include <stdlib.h>
#include <math.h>
#if defined (__GNUC__) && (__GNUC__ < 3)
extern double round(double);
#endif
+using namespace Opie::Ui;
+using namespace Opie::Core;
extern "C"
+
{
void BenchFFT( void );
double dhry_main( int );
}
#define DHRYSTONE_RUNS 20000000
@@ -172,18 +175,18 @@ void BenchmarkInfo::machineActivated( int index )
{
qDebug( "sysinfo: no results available." );
return;
}
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++) );
}
void BenchmarkInfo::run()
{
startButton->setText( "> Don't touch! Running Tests! Don't touch! <" );
@@ -256,23 +259,23 @@ int BenchmarkInfo::textRendering( int seconds )
srand( time( NULL ) );
BenchmarkPaintWidget bpw;
int loops = 0;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
int s = rand() % 100;
bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
bpw.p.setFont( QFont( "Vera", s ) );
bpw.p.drawText( rand() % w, rand() % h, text, text.length() );
++loops;
}
-
+
return loops * text.length();
}
int BenchmarkInfo::gfxRendering( int seconds )
{
int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 };
@@ -287,57 +290,57 @@ int BenchmarkInfo::gfxRendering( int seconds )
BenchmarkPaintWidget bpw;
QTime t;
t.start();
int stop = t.elapsed() + seconds*1000;
int loops = 0;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
bpw.p.drawLine( rand()%w, rand()%h, rand()%w, rand()%h );
++loops;
}
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
bpw.p.drawArc( rand()%w, rand()%h, rand()%w, rand()%h, 360 * 16, 360 * 16 );
++loops;
}
QBrush br1;
br1.setStyle( SolidPattern );
t.restart();
stop = t.elapsed() + seconds*1000;
-
+
while ( t.elapsed() < stop )
{
int k = rand() % 9;
br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
bpw.p.fillRect( rand()%w, rand()%h, rand()%w, rand()%h, br1 );
++loops;
}
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 );
++loops;
}
return loops;
-
+
}
void BenchmarkInfo::performFileTest( const QString& fname, OCheckListItem* item )
{
QTime time;
time.start();
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
@@ -20,48 +20,48 @@
#include <qdialog.h>
#include <qdict.h>
#include <qstringlist.h>
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
{
Q_OBJECT
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;
bool sd_rd;
bool sd_wt;
bool cf_rd;
bool cf_wt;
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& );
bool readFile( const QString& );
void run();
void machineActivated( int );
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
@@ -20,7 +20,8 @@
#include "sysinfo.h"
#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
@@ -33,12 +33,13 @@
#include <qmessagebox.h>
#include <qpushbutton.h>
#include <qtextview.h>
#include <qtimer.h>
#include <qwhatsthis.h>
+using namespace Opie::Ui;
ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 4 );
layout->setMargin( 4 );
@@ -55,14 +56,14 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl )
QWhatsThis::add( ModulesView, tr( "This is a list of all the kernel modules currently loaded on this handheld device.\n\nClick and hold on a module to see additional information about the module, or to unload it." ) );
// Test if we have /sbin/modinfo, and if so, allow module detail window
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 );
CommandCB->insertItem( "modprobe -r" );
CommandCB->insertItem( "rmmod" );
// I can't think of other useful commands yet. Anyone?
@@ -160,12 +161,17 @@ void ModulesInfo::slotSendClicked()
if ( stream )
pclose( stream );
}
}
+void ModulesInfo::viewModules( QListViewItem *module ) {
+ if ( !module )
+ return;
+ viewModules( static_cast<OListViewItem*>( module ) );
+}
void ModulesInfo::viewModules( OListViewItem *modules )
{
QString modname = modules->text( 0 );
QString capstr = "Module: ";
capstr.append( modname );
ModulesDtl->setCaption( capstr );
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
@@ -23,29 +23,31 @@
#define MODULESINFO_H
#include <qwidget.h>
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
{
Q_OBJECT
public:
ModulesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
~ModulesInfo();
private:
- OListView* ModulesView;
+ Opie::Ui::OListView* ModulesView;
QComboBox* CommandCB;
Detail* ModulesDtl;
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
@@ -35,12 +35,13 @@
#include <qwhatsthis.h>
/* STD */
#include <sys/types.h>
#include <signal.h>
+using namespace Opie::Ui;
ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
QGridLayout *layout = new QGridLayout( this );
layout->setSpacing( 4 );
layout->setMargin( 4 );
@@ -52,14 +53,14 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl )
colnum = ProcessView->addColumn( tr( "Command" ),96 );
colnum = ProcessView->addColumn( tr( "Status" ) );
colnum = ProcessView->addColumn( tr( "Time" ) );
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." ) );
SignalCB = new QComboBox( FALSE, this, "SignalCB" );
SignalCB->insertItem( " 1: SIGHUP" );
SignalCB->insertItem( " 2: SIGINT" );
@@ -182,12 +183,18 @@ void ProcessInfo::slotSendClicked()
kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid );
}
}
}
+void ProcessInfo::viewProcess( QListViewItem* process ) {
+ if ( !process )
+ return;
+ viewProcess( static_cast<OListViewItem*>( process ) );
+}
+
void ProcessInfo::viewProcess( OListViewItem *process )
{
QString pid= process->text( 0 ).stripWhiteSpace();
QString command = process->text( 1 );
ProcessDtl->setCaption( pid + " - " + command );
FILE *statfile = fopen( ( QString ) ( "/proc/" + pid + "/status"), "r");
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
@@ -21,30 +21,32 @@
#define PROCESSINFO_H
#include <qwidget.h>
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
{
Q_OBJECT
public:
ProcessInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
~ProcessInfo();
private:
- OListView* ProcessView;
+ Opie::Ui::OListView* ProcessView;
QComboBox* SignalCB;
QPushButton* SendButton;
Detail *ProcessDtl;
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
@@ -35,12 +35,13 @@
#include <qpe/config.h>
#include <qpe/resource.h>
#include <qlayout.h>
+using namespace Opie::Ui;
SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags )
: QWidget( parent, name, WStyle_ContextHelp )
{
setIcon( Resource::loadPixmap( "system_icon" ) );
setCaption( tr("System Info") );
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
@@ -30,13 +30,13 @@
#include <qlabel.h>
#include <qlayout.h>
#include <qscrollview.h>
#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 )
{
setMinimumSize( 200, 150 );
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
@@ -8,7 +8,8 @@
***************************************************************************/
#include "usermanager.h"
#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
@@ -24,19 +24,20 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
#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;
QVBoxLayout *layout = new QVBoxLayout(this);
myTabWidget=new QTabWidget(this,"User Tab Widget");
layout->addWidget(myTabWidget);