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 @@ #include "ipkg.h" #include "utils.h" #include "global.h" +using namespace Opie::Ui; enum { MAXLINES = 100, }; @@ -232,9 +233,9 @@ void InstallDlgImpl :: optionsSelected() 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; 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 @@ #include "utils.h" #include "ipkg.h" #include "global.h" +using namespace Opie::Core; Ipkg :: Ipkg() { proc = 0; } @@ -287,15 +288,15 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) 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 ) { 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 @@ #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 @@ -69,10 +69,10 @@ 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(); @@ -84,9 +84,9 @@ private: QString package; 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 @@ -34,5 +34,6 @@ /* 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 @@ -51,8 +51,10 @@ #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" ) ); @@ -62,9 +64,9 @@ SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const 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" ) ); 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 @@ #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 @@ -21,5 +21,6 @@ #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 @@ -21,5 +21,6 @@ #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 @@ -3,6 +3,7 @@ #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 @@ -29,5 +29,6 @@ #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 @@ -47,8 +47,10 @@ #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" ) ); @@ -187,11 +189,11 @@ 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*)) ); } 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; class SettingsTabWidget; class NTPTabWidget; class PredictTabWidget; -using Opie::OTabWidget; class QDateTime; class QSocket; class QTimer; @@ -59,9 +58,9 @@ protected: void accept(); void reject(); private: - OTabWidget *mainWidget; + Opie::Ui::OTabWidget *mainWidget; TimeTabWidget *timeTab; FormatTabWidget *formatTab; SettingsTabWidget *settingsTab; @@ -70,9 +69,9 @@ private: bool ntpTabEnabled; bool predictTabEnabled; - OProcess *ntpProcess; + Opie::Core::OProcess *ntpProcess; QTimer *ntpTimer; QSocket *ntpSock; int ntpDelay; bool ntpInteractive; @@ -89,10 +88,10 @@ private slots: 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 ); }; 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 @@ /** * 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,8 +1,8 @@ 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 @@ -24,8 +24,9 @@ /** * 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 @@ -41,8 +41,10 @@ /** * 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"); 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 @@ 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; @@ -37,10 +37,10 @@ private: 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; 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 @@ #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 ) @@ -274,9 +275,9 @@ void InstallDlg::slotBtnOptions() 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; 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 @@ #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 @@ -41,8 +41,9 @@ #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 ) 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: 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 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 @@ #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 ) 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 @@ #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 @@ -32,8 +32,9 @@ #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 ) @@ -44,13 +45,13 @@ SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) 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&))); @@ -85,11 +86,11 @@ void SSHKeysApp::doRefreshListButton() 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=""; @@ -276,11 +277,11 @@ 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"; 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 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 @@ -50,9 +50,12 @@ #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 ); } @@ -174,14 +177,14 @@ void BenchmarkInfo::machineActivated( int index ) 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() @@ -258,9 +261,9 @@ int BenchmarkInfo::textRendering( int seconds ) BenchmarkPaintWidget bpw; int loops = 0; - + while ( t.elapsed() < stop ) { int k = rand() % 9; int s = rand() % 100; @@ -268,9 +271,9 @@ int BenchmarkInfo::textRendering( int seconds ) 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 ) @@ -289,9 +292,9 @@ int BenchmarkInfo::gfxRendering( int seconds ) 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 ] ) ); @@ -300,9 +303,9 @@ int BenchmarkInfo::gfxRendering( int seconds ) } 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 ] ) ); @@ -313,9 +316,9 @@ int BenchmarkInfo::gfxRendering( int seconds ) 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 ] ) ); @@ -325,17 +328,17 @@ 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 ); ++loops; } 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 @@ -22,11 +22,11 @@ #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 @@ -34,15 +34,15 @@ class BenchmarkInfo : public QWidget 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; @@ -51,15 +51,15 @@ public: 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& ); 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 @@ #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 @@ -35,8 +35,9 @@ #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 ); @@ -57,10 +58,10 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) // 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" ); @@ -162,8 +163,13 @@ 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 ); 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 @@ #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 @@ -36,16 +37,17 @@ 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 @@ -37,8 +37,9 @@ /* 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 ); @@ -54,10 +55,10 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl ) 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" ); @@ -184,8 +185,14 @@ 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(); 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 @@ #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 @@ -34,17 +35,18 @@ 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 @@ -37,8 +37,9 @@ #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" ) ); 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 @@ #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 ) { 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 @@ #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 @@ -26,15 +26,16 @@ #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); |