author | zecke <zecke> | 2004-03-14 16:01:52 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 16:01:52 (UTC) |
commit | f12af18557c8f376f0c6c30e80a85737ff6c592e (patch) (unidiff) | |
tree | d60806f34f4ff6af82491579e80c9ef72cd4071e /noncore | |
parent | 13aeeabab5f2a6262b33de83cc9559a49365e325 (diff) | |
download | opie-f12af18557c8f376f0c6c30e80a85737ff6c592e.zip opie-f12af18557c8f376f0c6c30e80a85737ff6c592e.tar.gz opie-f12af18557c8f376f0c6c30e80a85737ff6c592e.tar.bz2 |
Make use of ODP
37 files changed, 106 insertions, 59 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 | |||
@@ -52,16 +52,17 @@ | |||
52 | #include "datamgr.h" | 52 | #include "datamgr.h" |
53 | #include "destination.h" | 53 | #include "destination.h" |
54 | #include "instoptionsimpl.h" | 54 | #include "instoptionsimpl.h" |
55 | #include "installdlgimpl.h" | 55 | #include "installdlgimpl.h" |
56 | #include "ipkg.h" | 56 | #include "ipkg.h" |
57 | #include "utils.h" | 57 | #include "utils.h" |
58 | #include "global.h" | 58 | #include "global.h" |
59 | 59 | ||
60 | using namespace Opie::Ui; | ||
60 | enum { | 61 | enum { |
61 | MAXLINES = 100, | 62 | MAXLINES = 100, |
62 | }; | 63 | }; |
63 | 64 | ||
64 | InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title ) | 65 | InstallDlgImpl::InstallDlgImpl( const QList<InstallData> &packageList, DataManager *dataManager, const char *title ) |
65 | : QWidget( 0, 0, 0 ) | 66 | : QWidget( 0, 0, 0 ) |
66 | { | 67 | { |
67 | setCaption( title ); | 68 | setCaption( title ); |
@@ -228,17 +229,17 @@ void InstallDlgImpl :: optionsSelected() | |||
228 | QMap<QString, QStringList> map; | 229 | QMap<QString, QStringList> map; |
229 | map.insert( tr( "All" ), QStringList() ); | 230 | map.insert( tr( "All" ), QStringList() ); |
230 | QStringList text; | 231 | QStringList text; |
231 | text << "text/*"; | 232 | text << "text/*"; |
232 | map.insert(tr( "Text" ), text ); | 233 | map.insert(tr( "Text" ), text ); |
233 | text << "*"; | 234 | text << "*"; |
234 | map.insert( tr( "All" ), text ); | 235 | map.insert( tr( "All" ), text ); |
235 | 236 | ||
236 | QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); | 237 | QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); |
237 | if( !filename.isEmpty() ) | 238 | if( !filename.isEmpty() ) |
238 | { | 239 | { |
239 | QString currentFileName = QFileInfo( filename ).fileName(); | 240 | QString currentFileName = QFileInfo( filename ).fileName(); |
240 | DocLnk doc; | 241 | DocLnk doc; |
241 | doc.setType( "text/plain" ); | 242 | doc.setType( "text/plain" ); |
242 | doc.setFile( filename ); | 243 | doc.setFile( filename ); |
243 | doc.setName( currentFileName ); | 244 | doc.setName( currentFileName ); |
244 | FileManager fm; | 245 | FileManager fm; |
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 | |||
@@ -37,16 +37,17 @@ | |||
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qfile.h> | 38 | #include <qfile.h> |
39 | #include <qtextstream.h> | 39 | #include <qtextstream.h> |
40 | 40 | ||
41 | #include "utils.h" | 41 | #include "utils.h" |
42 | #include "ipkg.h" | 42 | #include "ipkg.h" |
43 | #include "global.h" | 43 | #include "global.h" |
44 | 44 | ||
45 | using namespace Opie::Core; | ||
45 | Ipkg :: Ipkg() | 46 | Ipkg :: Ipkg() |
46 | { | 47 | { |
47 | proc = 0; | 48 | proc = 0; |
48 | } | 49 | } |
49 | 50 | ||
50 | Ipkg :: ~Ipkg() | 51 | Ipkg :: ~Ipkg() |
51 | { | 52 | { |
52 | } | 53 | } |
@@ -283,23 +284,23 @@ int Ipkg :: executeIpkgCommand( QStringList &cmd, const QString /*option*/ ) | |||
283 | } | 284 | } |
284 | 285 | ||
285 | // OK we're gonna use OProcess to run this thing | 286 | // OK we're gonna use OProcess to run this thing |
286 | proc = new OProcess(); | 287 | proc = new OProcess(); |
287 | aborted = false; | 288 | aborted = false; |
288 | 289 | ||
289 | 290 | ||
290 | // Connect up our slots | 291 | // Connect up our slots |
291 | connect(proc, SIGNAL(processExited(OProcess*)), | 292 | connect(proc, SIGNAL(processExited(Opie::Core::OProcess*)), |
292 | this, SLOT( processFinished())); | 293 | this, SLOT( processFinished())); |
293 | 294 | ||
294 | connect(proc, SIGNAL(receivedStdout(OProcess*,char*,int)), | 295 | connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
295 | this, SLOT(commandStdout(OProcess*,char*,int))); | 296 | this, SLOT(commandStdout(OProcess*,char*,int))); |
296 | 297 | ||
297 | connect(proc, SIGNAL(receivedStderr(OProcess*,char*,int)), | 298 | connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
298 | this, SLOT(commandStderr(OProcess*,char*,int))); | 299 | this, SLOT(commandStderr(OProcess*,char*,int))); |
299 | 300 | ||
300 | for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) | 301 | for ( QStringList::Iterator it = cmd.begin(); it != cmd.end(); ++it ) |
301 | { | 302 | { |
302 | *proc << (*it).latin1(); | 303 | *proc << (*it).latin1(); |
303 | } | 304 | } |
304 | 305 | ||
305 | // Start the process going | 306 | // Start the process going |
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 | |||
@@ -42,17 +42,17 @@ | |||
42 | 42 | ||
43 | #define FORCE_DEPENDS 0x0001 | 43 | #define FORCE_DEPENDS 0x0001 |
44 | #define FORCE_REMOVE 0x0002 | 44 | #define FORCE_REMOVE 0x0002 |
45 | #define FORCE_REINSTALL 0x0004 | 45 | #define FORCE_REINSTALL 0x0004 |
46 | #define FORCE_OVERWRITE 0x0008 | 46 | #define FORCE_OVERWRITE 0x0008 |
47 | #define MAKE_LINKS 0x0010 | 47 | #define MAKE_LINKS 0x0010 |
48 | #define VERBOSE_WGET 0x0020 | 48 | #define VERBOSE_WGET 0x0020 |
49 | 49 | ||
50 | class OProcess; | 50 | namespace Opie {namespace Core {class OProcess;}} |
51 | 51 | ||
52 | class Ipkg : public QObject | 52 | class Ipkg : public QObject |
53 | { | 53 | { |
54 | Q_OBJECT | 54 | Q_OBJECT |
55 | public: | 55 | public: |
56 | Ipkg(); | 56 | Ipkg(); |
57 | ~Ipkg(); | 57 | ~Ipkg(); |
58 | void runIpkg(); | 58 | void runIpkg(); |
@@ -65,32 +65,32 @@ public: | |||
65 | void setFlags( int fl, int il ) { flags = fl; infoLevel = il; } | 65 | void setFlags( int fl, int il ) { flags = fl; infoLevel = il; } |
66 | void setRuntimeDirectory( const char *dir ) { runtimeDir = dir; } | 66 | void setRuntimeDirectory( const char *dir ) { runtimeDir = dir; } |
67 | 67 | ||
68 | signals: | 68 | signals: |
69 | void outputText( const QString &text ); | 69 | void outputText( const QString &text ); |
70 | void ipkgFinished(); | 70 | void ipkgFinished(); |
71 | 71 | ||
72 | public slots: | 72 | public slots: |
73 | void commandStdout(OProcess*, char *buffer, int buflen); | 73 | void commandStdout(Opie::Core::OProcess*, char *buffer, int buflen); |
74 | void commandStderr(OProcess*, char *buffer, int buflen); | 74 | void commandStderr(Opie::Core::OProcess*, char *buffer, int buflen); |
75 | void processFinished(); | 75 | void processFinished(); |
76 | void abort(); | 76 | void abort(); |
77 | 77 | ||
78 | 78 | ||
79 | private: | 79 | private: |
80 | bool createLinks; | 80 | bool createLinks; |
81 | bool aborted; | 81 | bool aborted; |
82 | bool error; | 82 | bool error; |
83 | QString option; | 83 | QString option; |
84 | QString package; | 84 | QString package; |
85 | QString destination; | 85 | QString destination; |
86 | QString destDir; | 86 | QString destDir; |
87 | QString runtimeDir; | 87 | QString runtimeDir; |
88 | OProcess *proc; | 88 | Opie::Core::OProcess *proc; |
89 | int flags; | 89 | int flags; |
90 | int infoLevel; | 90 | int infoLevel; |
91 | bool finished; | 91 | bool finished; |
92 | 92 | ||
93 | QList<QString> *dependantPackages; | 93 | QList<QString> *dependantPackages; |
94 | 94 | ||
95 | int executeIpkgCommand( QStringList &cmd, const QString option ); | 95 | int executeIpkgCommand( QStringList &cmd, const QString option ); |
96 | void removeStatusEntry(); | 96 | void removeStatusEntry(); |
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 | |||
@@ -30,9 +30,10 @@ | |||
30 | #include "mainwin.h" | 30 | #include "mainwin.h" |
31 | 31 | ||
32 | #include <opie2/oapplicationfactory.h> | 32 | #include <opie2/oapplicationfactory.h> |
33 | 33 | ||
34 | /* be less intrusive for translation -zecke */ | 34 | /* be less intrusive for translation -zecke */ |
35 | extern QString LOCAL_SERVER; | 35 | extern QString LOCAL_SERVER; |
36 | extern QString LOCAL_IPKGS; | 36 | extern QString LOCAL_IPKGS; |
37 | 37 | ||
38 | using namespace Opie::Core; | ||
38 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 39 | 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 | |||
@@ -47,28 +47,30 @@ | |||
47 | #include <qlistbox.h> | 47 | #include <qlistbox.h> |
48 | #include <qpushbutton.h> | 48 | #include <qpushbutton.h> |
49 | 49 | ||
50 | /* STD */ | 50 | /* STD */ |
51 | #include <fstream> | 51 | #include <fstream> |
52 | #include <algorithm> | 52 | #include <algorithm> |
53 | using namespace std; | 53 | using namespace std; |
54 | 54 | ||
55 | using namespace Opie::Ui; | ||
56 | using namespace Opie::Ui; | ||
55 | SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) | 57 | SettingsImpl :: SettingsImpl( DataManager *dataManager, QWidget * parent, const char* name, bool modal, WFlags fl ) |
56 | : QDialog( parent, name, modal, fl ) | 58 | : QDialog( parent, name, modal, fl ) |
57 | { | 59 | { |
58 | setCaption( tr( "Configuration" ) ); | 60 | setCaption( tr( "Configuration" ) ); |
59 | 61 | ||
60 | // Setup layout to make everything pretty | 62 | // Setup layout to make everything pretty |
61 | QVBoxLayout *layout = new QVBoxLayout( this ); | 63 | QVBoxLayout *layout = new QVBoxLayout( this ); |
62 | layout->setMargin( 2 ); | 64 | layout->setMargin( 2 ); |
63 | layout->setSpacing( 4 ); | 65 | layout->setSpacing( 4 ); |
64 | 66 | ||
65 | // Setup tabs for all info | 67 | // Setup tabs for all info |
66 | Opie::OTabWidget *tabwidget = new Opie::OTabWidget( this ); | 68 | OTabWidget *tabwidget = new OTabWidget( this ); |
67 | layout->addWidget( tabwidget ); | 69 | layout->addWidget( tabwidget ); |
68 | 70 | ||
69 | tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) ); | 71 | tabwidget->addTab( initServerTab(), "aqpkg/servertab", tr( "Servers" ) ); |
70 | tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) ); | 72 | tabwidget->addTab( initDestinationTab(), "aqpkg/desttab", tr( "Destinations" ) ); |
71 | tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) ); | 73 | tabwidget->addTab( initProxyTab(), "aqpkg/proxytab", tr( "Proxies" ) ); |
72 | tabwidget->setCurrentTab( tr( "Servers" ) ); | 74 | tabwidget->setCurrentTab( tr( "Servers" ) ); |
73 | 75 | ||
74 | dataMgr = dataManager; | 76 | dataMgr = dataManager; |
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 @@ | |||
1 | #include "backuprestore.h" | 1 | #include "backuprestore.h" |
2 | #include "qnetworkprotocol.h" | 2 | #include "qnetworkprotocol.h" |
3 | #include <qpe/qpeapplication.h> | 3 | #include <qpe/qpeapplication.h> |
4 | #include <opie2/oapplicationfactory.h> | 4 | #include <opie2/oapplicationfactory.h> |
5 | 5 | ||
6 | 6 | ||
7 | using namespace Opie::Core; | ||
7 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<BackupAndRestore> ) | 8 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<BackupAndRestore> ) |
8 | 9 | ||
diff --git a/noncore/settings/doctab/main.cpp b/noncore/settings/doctab/main.cpp index 13591e0..75d9fcb 100644 --- a/noncore/settings/doctab/main.cpp +++ b/noncore/settings/doctab/main.cpp | |||
@@ -17,9 +17,10 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "doctab.h" | 21 | #include "doctab.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<DocTabSettings> ) | 26 | 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 | |||
@@ -17,9 +17,10 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "settings.h" | 21 | #include "settings.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<LanguageSettings> ) | 26 | 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 @@ | |||
1 | #include "mediumwidget.h" | 1 | #include "mediumwidget.h" |
2 | #include "mediumglobal.h" | 2 | #include "mediumglobal.h" |
3 | #include "mainwindow.h" | 3 | #include "mainwindow.h" |
4 | 4 | ||
5 | #include <opie2/oapplicationfactory.h> | 5 | #include <opie2/oapplicationfactory.h> |
6 | 6 | ||
7 | using namespace Opie::Core; | ||
7 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MediumMountSetting::MainWindow> ) | 8 | OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MediumMountSetting::MainWindow> ) |
8 | 9 | ||
diff --git a/noncore/settings/netsystemtime/main.cpp b/noncore/settings/netsystemtime/main.cpp index 4a2d17c..dbcdc17 100644 --- a/noncore/settings/netsystemtime/main.cpp +++ b/noncore/settings/netsystemtime/main.cpp | |||
@@ -25,9 +25,10 @@ | |||
25 | Boston, MA 02111-1307, USA. | 25 | Boston, MA 02111-1307, USA. |
26 | 26 | ||
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include "mainwindow.h" | 29 | #include "mainwindow.h" |
30 | 30 | ||
31 | #include <opie2/oapplicationfactory.h> | 31 | #include <opie2/oapplicationfactory.h> |
32 | 32 | ||
33 | using namespace Opie::Core; | ||
33 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 34 | 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 | |||
@@ -43,16 +43,18 @@ | |||
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | #include <qlayout.h> | 45 | #include <qlayout.h> |
46 | #include <qmessagebox.h> | 46 | #include <qmessagebox.h> |
47 | #include <qsocket.h> | 47 | #include <qsocket.h> |
48 | #include <qstring.h> | 48 | #include <qstring.h> |
49 | #include <qtimer.h> | 49 | #include <qtimer.h> |
50 | 50 | ||
51 | using namespace Opie::Ui; | ||
52 | using namespace Opie::Core; | ||
51 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) | 53 | MainWindow::MainWindow( QWidget *parent , const char *name, bool modal, WFlags f ) |
52 | : QDialog( 0x0, 0x0, TRUE, 0 ) | 54 | : QDialog( 0x0, 0x0, TRUE, 0 ) |
53 | { | 55 | { |
54 | setCaption( tr( "SystemTime" ) ); | 56 | setCaption( tr( "SystemTime" ) ); |
55 | 57 | ||
56 | QVBoxLayout *layout = new QVBoxLayout( this ); | 58 | QVBoxLayout *layout = new QVBoxLayout( this ); |
57 | layout->setMargin( 2 ); | 59 | layout->setMargin( 2 ); |
58 | layout->setSpacing( 4 ); | 60 | layout->setSpacing( 4 ); |
@@ -183,19 +185,19 @@ void MainWindow::runNTP() | |||
183 | QString output = tr( "Running:\nntpdate " ); | 185 | QString output = tr( "Running:\nntpdate " ); |
184 | output.append( srv ); | 186 | output.append( srv ); |
185 | ntpTab->addNtpOutput( output ); | 187 | ntpTab->addNtpOutput( output ); |
186 | } | 188 | } |
187 | 189 | ||
188 | if ( !ntpProcess ) | 190 | if ( !ntpProcess ) |
189 | { | 191 | { |
190 | ntpProcess = new OProcess(); | 192 | ntpProcess = new OProcess(); |
191 | connect( ntpProcess, SIGNAL(receivedStdout(OProcess*,char*,int)), | 193 | connect( ntpProcess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
192 | this, SLOT(slotNtpOutput(OProcess*,char*,int)) ); | 194 | this, SLOT(slotNtpOutput(OProcess*,char*,int)) ); |
193 | connect( ntpProcess, SIGNAL(processExited(OProcess*)), | 195 | connect( ntpProcess, SIGNAL(processExited(Opie::Core::OProcess*)), |
194 | this, SLOT(slotNtpFinished(OProcess*)) ); | 196 | this, SLOT(slotNtpFinished(OProcess*)) ); |
195 | } | 197 | } |
196 | 198 | ||
197 | else | 199 | else |
198 | ntpProcess->clearArguments(); | 200 | ntpProcess->clearArguments(); |
199 | 201 | ||
200 | *ntpProcess << "ntpdate" << srv; | 202 | *ntpProcess << "ntpdate" << srv; |
201 | bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); | 203 | bool ret = ntpProcess->start( OProcess::NotifyOnExit, OProcess::AllOutput ); |
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 | |||
@@ -35,17 +35,16 @@ | |||
35 | #include <opie2/otabwidget.h> | 35 | #include <opie2/otabwidget.h> |
36 | 36 | ||
37 | class TimeTabWidget; | 37 | class TimeTabWidget; |
38 | class FormatTabWidget; | 38 | class FormatTabWidget; |
39 | class SettingsTabWidget; | 39 | class SettingsTabWidget; |
40 | class NTPTabWidget; | 40 | class NTPTabWidget; |
41 | class PredictTabWidget; | 41 | class PredictTabWidget; |
42 | 42 | ||
43 | using Opie::OTabWidget; | ||
44 | 43 | ||
45 | class QDateTime; | 44 | class QDateTime; |
46 | class QSocket; | 45 | class QSocket; |
47 | class QTimer; | 46 | class QTimer; |
48 | 47 | ||
49 | class MainWindow : public QDialog | 48 | class MainWindow : public QDialog |
50 | { | 49 | { |
51 | Q_OBJECT | 50 | Q_OBJECT |
@@ -55,28 +54,28 @@ public: | |||
55 | ~MainWindow(); | 54 | ~MainWindow(); |
56 | static QString appName() { return QString::fromLatin1("systemtime"); } | 55 | static QString appName() { return QString::fromLatin1("systemtime"); } |
57 | 56 | ||
58 | protected: | 57 | protected: |
59 | void accept(); | 58 | void accept(); |
60 | void reject(); | 59 | void reject(); |
61 | 60 | ||
62 | private: | 61 | private: |
63 | OTabWidget *mainWidget; | 62 | Opie::Ui::OTabWidget *mainWidget; |
64 | 63 | ||
65 | TimeTabWidget *timeTab; | 64 | TimeTabWidget *timeTab; |
66 | FormatTabWidget *formatTab; | 65 | FormatTabWidget *formatTab; |
67 | SettingsTabWidget *settingsTab; | 66 | SettingsTabWidget *settingsTab; |
68 | NTPTabWidget *ntpTab; | 67 | NTPTabWidget *ntpTab; |
69 | PredictTabWidget *predictTab; | 68 | PredictTabWidget *predictTab; |
70 | 69 | ||
71 | bool ntpTabEnabled; | 70 | bool ntpTabEnabled; |
72 | bool predictTabEnabled; | 71 | bool predictTabEnabled; |
73 | 72 | ||
74 | OProcess *ntpProcess; | 73 | Opie::Core::OProcess *ntpProcess; |
75 | QTimer *ntpTimer; | 74 | QTimer *ntpTimer; |
76 | QSocket *ntpSock; | 75 | QSocket *ntpSock; |
77 | int ntpDelay; | 76 | int ntpDelay; |
78 | bool ntpInteractive; | 77 | bool ntpInteractive; |
79 | QString ntpOutput; | 78 | QString ntpOutput; |
80 | int _lookupDiff; | 79 | int _lookupDiff; |
81 | 80 | ||
82 | void runNTP(); | 81 | void runNTP(); |
@@ -85,15 +84,15 @@ private: | |||
85 | private slots: | 84 | private slots: |
86 | void slotSetTime( const QDateTime & ); | 85 | void slotSetTime( const QDateTime & ); |
87 | void slotQCopReceive( const QCString &, const QByteArray & ); | 86 | void slotQCopReceive( const QCString &, const QByteArray & ); |
88 | void slotDisplayNTPTab( bool ); | 87 | void slotDisplayNTPTab( bool ); |
89 | void slotDisplayPredictTab( bool ); | 88 | void slotDisplayPredictTab( bool ); |
90 | void slotGetNTPTime(); | 89 | void slotGetNTPTime(); |
91 | void slotTimerGetNTPTime(); | 90 | void slotTimerGetNTPTime(); |
92 | void slotProbeNTPServer(); | 91 | void slotProbeNTPServer(); |
93 | void slotNtpOutput( OProcess *, char *, int ); | 92 | void slotNtpOutput( Opie::Core::OProcess *, char *, int ); |
94 | void slotNtpFinished( OProcess* ); | 93 | void slotNtpFinished( Opie::Core::OProcess* ); |
95 | void slotNTPDelayChanged( int ); | 94 | void slotNTPDelayChanged( int ); |
96 | void slotCheckNtp( int ); | 95 | void slotCheckNtp( int ); |
97 | }; | 96 | }; |
98 | 97 | ||
99 | #endif | 98 | #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 | |||
@@ -17,16 +17,18 @@ | |||
17 | #include <qapplication.h> | 17 | #include <qapplication.h> |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #define DNSSCRIPT "changedns" | 20 | #define DNSSCRIPT "changedns" |
21 | 21 | ||
22 | /** | 22 | /** |
23 | * Constuctor. Set up the connection. A profile must be set. | 23 | * Constuctor. Set up the connection. A profile must be set. |
24 | */ | 24 | */ |
25 | using namespace Opie::Ui; | ||
26 | using namespace Opie::Core; | ||
25 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){ | 27 | InterfaceSetupImp::InterfaceSetupImp(QWidget* parent, const char* name, Interface *i, Interfaces *j, WFlags fl) : InterfaceSetup(parent, name, fl), interface(i), interfaces(j), delInterfaces(false){ |
26 | if (j == 0) { | 28 | if (j == 0) { |
27 | delInterfaces = true; | 29 | delInterfaces = true; |
28 | interfaces = new Interfaces; | 30 | interfaces = new Interfaces; |
29 | } | 31 | } |
30 | } | 32 | } |
31 | 33 | ||
32 | /** | 34 | /** |
diff --git a/noncore/settings/networksettings/main.cpp b/noncore/settings/networksettings/main.cpp index bc11ab4..e4153c3 100644 --- a/noncore/settings/networksettings/main.cpp +++ b/noncore/settings/networksettings/main.cpp | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "mainwindowimp.h" | 1 | #include "mainwindowimp.h" |
2 | #include <opie2/oapplicationfactory.h> | 2 | #include <opie2/oapplicationfactory.h> |
3 | 3 | ||
4 | using namespace Opie::Core; | ||
4 | OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> ) | 5 | OPIE_EXPORT_APP( OApplicationFactory<MainWindowImp> ) |
5 | 6 | ||
6 | 7 | ||
diff --git a/noncore/settings/networksettings/networksettings.pro b/noncore/settings/networksettings/networksettings.pro index 5db2d6b..281629c 100644 --- a/noncore/settings/networksettings/networksettings.pro +++ b/noncore/settings/networksettings/networksettings.pro | |||
@@ -1,12 +1,12 @@ | |||
1 | CONFIG = qt warn_on debug quick-app | 1 | CONFIG = qt warn_on debug quick-app |
2 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h | 2 | HEADERS = mainwindowimp.h addconnectionimp.h defaultmodule.h module.h |
3 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp | 3 | SOURCES = main.cpp mainwindowimp.cpp addconnectionimp.cpp |
4 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ | 4 | INCLUDEPATH += $(OPIEDIR)/include interfaces/ . |
5 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/ | 5 | DEPENDPATH += $(OPIEDIR)/include interfaces/ wlan/ ppp/ |
6 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2 | 6 | LIBS += -lqpe -L$(OPIEDIR)/plugins/networksettings -Linterfaces/ -linterfaces -lopiecore2 -lopieui2 |
7 | INTERFACES = mainwindow.ui addconnection.ui | 7 | INTERFACES = mainwindow.ui addconnection.ui |
8 | TARGET = networksettings | 8 | TARGET = networksettings |
9 | 9 | ||
10 | 10 | ||
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include ( $(OPIEDIR)/include.pro ) |
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 | |||
@@ -20,16 +20,17 @@ | |||
20 | #include <kprocess.h> | 20 | #include <kprocess.h> |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" | 23 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" |
24 | 24 | ||
25 | /** | 25 | /** |
26 | * Constructor, read in the wireless.opts file for parsing later. | 26 | * Constructor, read in the wireless.opts file for parsing later. |
27 | */ | 27 | */ |
28 | using namespace Opie::Core; | ||
28 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { | 29 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl):WLAN(parent, name, modal, fl), currentProfile("*") { |
29 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); | 30 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i); |
30 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 31 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
31 | 32 | ||
32 | // Read in the config file. | 33 | // Read in the config file. |
33 | QString wlanFile = WIRELESS_OPTS; | 34 | QString wlanFile = WIRELESS_OPTS; |
34 | QFile file(wlanFile); | 35 | QFile file(wlanFile); |
35 | if (file.open(IO_ReadOnly)){ | 36 | if (file.open(IO_ReadOnly)){ |
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 | |||
@@ -37,16 +37,18 @@ | |||
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" | 39 | #define WIRELESS_OPTS "/etc/pcmcia/wireless.opts" |
40 | #define PREUP "/etc/network/if-pre-up.d/wireless-tools" | 40 | #define PREUP "/etc/network/if-pre-up.d/wireless-tools" |
41 | 41 | ||
42 | /** | 42 | /** |
43 | * Constructor, read in the wireless.opts file for parsing later. | 43 | * Constructor, read in the wireless.opts file for parsing later. |
44 | */ | 44 | */ |
45 | using namespace Opie::Net; | ||
46 | using namespace Opie::Core; | ||
45 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") { | 47 | WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, WFlags fl) : WLAN(parent, name, modal, fl), interface(i), currentProfile("*") { |
46 | interfaces = new Interfaces(); | 48 | interfaces = new Interfaces(); |
47 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces); | 49 | interfaceSetup = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, interfaces); |
48 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); | 50 | tabWidget->insertTab(interfaceSetup, "TCP/IP"); |
49 | 51 | ||
50 | // Check sanity - the existance of the wireless-tools if-pre-up script | 52 | // Check sanity - the existance of the wireless-tools if-pre-up script |
51 | QFile file(QString(PREUP)); | 53 | QFile file(QString(PREUP)); |
52 | if (file.exists()) { | 54 | if (file.exists()) { |
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 | |||
@@ -4,17 +4,17 @@ | |||
4 | #include "wlan.h" | 4 | #include "wlan.h" |
5 | #include "interfaces.h" | 5 | #include "interfaces.h" |
6 | #include <qstringlist.h> | 6 | #include <qstringlist.h> |
7 | #include <opie2/onetutils.h> | 7 | #include <opie2/onetutils.h> |
8 | 8 | ||
9 | class InterfaceSetupImp; | 9 | class InterfaceSetupImp; |
10 | class Interface; | 10 | class Interface; |
11 | class Config; | 11 | class Config; |
12 | class OPacket; | 12 | namespace Opie {namespace Net {class OPacket;}} |
13 | class QListViewItem; | 13 | class QListViewItem; |
14 | 14 | ||
15 | const int col_mode= 0; | 15 | const int col_mode= 0; |
16 | const int col_ssid = 1; | 16 | const int col_ssid = 1; |
17 | const int col_chn = 2; | 17 | const int col_chn = 2; |
18 | const int col_mac = 3; | 18 | const int col_mac = 3; |
19 | 19 | ||
20 | class WLANImp : public WLAN { | 20 | class WLANImp : public WLAN { |
@@ -33,18 +33,18 @@ protected: | |||
33 | void accept(); | 33 | void accept(); |
34 | 34 | ||
35 | private: | 35 | private: |
36 | void parseOpts(); | 36 | void parseOpts(); |
37 | void writeOpts(); | 37 | void writeOpts(); |
38 | 38 | ||
39 | void parseKeyStr(QString keystr); | 39 | void parseKeyStr(QString keystr); |
40 | 40 | ||
41 | void handlePacket( OPacket* ); | 41 | void handlePacket( Opie::Net::OPacket* ); |
42 | void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const OMacAddress& mac ); | 42 | void displayFoundNetwork( const QString& mode, int channel, const QString& ssid, const Opie::Net::OMacAddress& mac ); |
43 | 43 | ||
44 | InterfaceSetupImp *interfaceSetup; | 44 | InterfaceSetupImp *interfaceSetup; |
45 | Interfaces *interfaces; | 45 | Interfaces *interfaces; |
46 | Interface *interface; | 46 | Interface *interface; |
47 | 47 | ||
48 | QString currentProfile; | 48 | QString currentProfile; |
49 | }; | 49 | }; |
50 | 50 | ||
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 | |||
@@ -44,16 +44,17 @@ | |||
44 | #include <qpe/fileselector.h> | 44 | #include <qpe/fileselector.h> |
45 | #include <qpe/resource.h> | 45 | #include <qpe/resource.h> |
46 | #include <qpe/storage.h> | 46 | #include <qpe/storage.h> |
47 | 47 | ||
48 | #include <opie2/ofiledialog.h> | 48 | #include <opie2/ofiledialog.h> |
49 | 49 | ||
50 | #include "opackagemanager.h" | 50 | #include "opackagemanager.h" |
51 | 51 | ||
52 | using namespace Opie::Ui; | ||
52 | InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo, | 53 | InstallDlg::InstallDlg( QWidget *parent, OPackageManager *pm, const QString &caption, bool showDestInfo, |
53 | OPackage::Command command1, QStringList *packages1, | 54 | OPackage::Command command1, QStringList *packages1, |
54 | OPackage::Command command2, QStringList *packages2, | 55 | OPackage::Command command2, QStringList *packages2, |
55 | OPackage::Command command3, QStringList *packages3 ) | 56 | OPackage::Command command3, QStringList *packages3 ) |
56 | : QWidget( 0x0 ) | 57 | : QWidget( 0x0 ) |
57 | , m_packman( pm ) | 58 | , m_packman( pm ) |
58 | , m_numCommands( 0 ) | 59 | , m_numCommands( 0 ) |
59 | , m_currCommand( 0 ) | 60 | , m_currCommand( 0 ) |
@@ -270,17 +271,17 @@ void InstallDlg::slotBtnOptions() | |||
270 | QMap<QString, QStringList> map; | 271 | QMap<QString, QStringList> map; |
271 | map.insert( tr( "All" ), QStringList() ); | 272 | map.insert( tr( "All" ), QStringList() ); |
272 | QStringList text; | 273 | QStringList text; |
273 | text << "text/*"; | 274 | text << "text/*"; |
274 | map.insert(tr( "Text" ), text ); | 275 | map.insert(tr( "Text" ), text ); |
275 | text << "*"; | 276 | text << "*"; |
276 | map.insert( tr( "All" ), text ); | 277 | map.insert( tr( "All" ), text ); |
277 | 278 | ||
278 | QString filename = Opie::OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); | 279 | QString filename = OFileDialog::getSaveFileName( 2, "/", "ipkg-output", map ); |
279 | if( !filename.isEmpty() ) | 280 | if( !filename.isEmpty() ) |
280 | { | 281 | { |
281 | QString currentFileName = QFileInfo( filename ).fileName(); | 282 | QString currentFileName = QFileInfo( filename ).fileName(); |
282 | DocLnk doc; | 283 | DocLnk doc; |
283 | doc.setType( "text/plain" ); | 284 | doc.setType( "text/plain" ); |
284 | doc.setFile( filename ); | 285 | doc.setFile( filename ); |
285 | doc.setName( currentFileName ); | 286 | doc.setName( currentFileName ); |
286 | FileManager fm; | 287 | FileManager fm; |
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 | |||
@@ -26,9 +26,10 @@ | |||
26 | Boston, MA 02111-1307, USA. | 26 | Boston, MA 02111-1307, USA. |
27 | 27 | ||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #include "mainwindow.h" | 30 | #include "mainwindow.h" |
31 | 31 | ||
32 | #include <opie2/oapplicationfactory.h> | 32 | #include <opie2/oapplicationfactory.h> |
33 | 33 | ||
34 | using namespace Opie::Core; | ||
34 | OPIE_EXPORT_APP( OApplicationFactory<MainWindow> ) | 35 | 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 | |||
@@ -37,16 +37,17 @@ | |||
37 | #include <qlabel.h> | 37 | #include <qlabel.h> |
38 | #include <qlineedit.h> | 38 | #include <qlineedit.h> |
39 | #include <qlistbox.h> | 39 | #include <qlistbox.h> |
40 | #include <qpushbutton.h> | 40 | #include <qpushbutton.h> |
41 | #include <qscrollview.h> | 41 | #include <qscrollview.h> |
42 | 42 | ||
43 | #include <qpe/resource.h> | 43 | #include <qpe/resource.h> |
44 | 44 | ||
45 | using namespace Opie::Ui; | ||
45 | OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) | 46 | OIpkgConfigDlg::OIpkgConfigDlg( OIpkg *ipkg, bool installOptions, QWidget *parent ) |
46 | : QDialog( parent, QString::null, true ) | 47 | : QDialog( parent, QString::null, true ) |
47 | , m_ipkg( ipkg ) | 48 | , m_ipkg( ipkg ) |
48 | , m_configs( 0x0 ) | 49 | , m_configs( 0x0 ) |
49 | , m_installOptions( installOptions ) | 50 | , m_installOptions( installOptions ) |
50 | , m_serverNew( false ) | 51 | , m_serverNew( false ) |
51 | , m_serverCurrent( -1 ) | 52 | , m_serverCurrent( -1 ) |
52 | , m_destNew( false ) | 53 | , m_destNew( 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 | |||
@@ -69,17 +69,17 @@ private: | |||
69 | 69 | ||
70 | // Destination cached information | 70 | // Destination cached information |
71 | bool m_destNew; // Indicates if destination information is for a new destination | 71 | bool m_destNew; // Indicates if destination information is for a new destination |
72 | int m_destCurrent; // Index of currently selected destination in m_destList | 72 | int m_destCurrent; // Index of currently selected destination in m_destList |
73 | QString m_destCurrName; // Name of currently selected destination in m_destList | 73 | QString m_destCurrName; // Name of currently selected destination in m_destList |
74 | 74 | ||
75 | // UI controls | 75 | // UI controls |
76 | QVBoxLayout m_layout; // Main dialog layout control | 76 | QVBoxLayout m_layout; // Main dialog layout control |
77 | OTabWidget m_tabWidget; // Main tab widget control | 77 | Opie::Ui::OTabWidget m_tabWidget; // Main tab widget control |
78 | QWidget *m_serverWidget; // Widget containing server configuration controls | 78 | QWidget *m_serverWidget; // Widget containing server configuration controls |
79 | QWidget *m_destWidget; // Widget containing destination configuration controls | 79 | QWidget *m_destWidget; // Widget containing destination configuration controls |
80 | QWidget *m_proxyWidget; // Widget containing proxy configuration controls | 80 | QWidget *m_proxyWidget; // Widget containing proxy configuration controls |
81 | QWidget *m_optionsWidget; // Widget containing ipkg execution configuration controls | 81 | QWidget *m_optionsWidget; // Widget containing ipkg execution configuration controls |
82 | 82 | ||
83 | // Server configuration UI controls | 83 | // Server configuration UI controls |
84 | QListBox *m_serverList; // Server list selection | 84 | QListBox *m_serverList; // Server list selection |
85 | QLineEdit *m_serverName; // Server name edit box | 85 | QLineEdit *m_serverName; // Server name edit box |
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 | |||
@@ -33,16 +33,17 @@ | |||
33 | 33 | ||
34 | #include <qlayout.h> | 34 | #include <qlayout.h> |
35 | #include <qpushbutton.h> | 35 | #include <qpushbutton.h> |
36 | 36 | ||
37 | #include <qpe/resource.h> | 37 | #include <qpe/resource.h> |
38 | 38 | ||
39 | #include <opie2/otabwidget.h> | 39 | #include <opie2/otabwidget.h> |
40 | 40 | ||
41 | using namespace Opie::Ui; | ||
41 | PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) | 42 | PackageInfoDlg::PackageInfoDlg( QWidget *parent, OPackageManager *pm, const QString &package ) |
42 | : QWidget( 0x0 ) | 43 | : QWidget( 0x0 ) |
43 | , m_packman( pm ) | 44 | , m_packman( pm ) |
44 | , m_information( this ) | 45 | , m_information( this ) |
45 | , m_files( this ) | 46 | , m_files( this ) |
46 | { | 47 | { |
47 | // Initialize UI | 48 | // Initialize UI |
48 | if ( parent ) | 49 | if ( parent ) |
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 | |||
@@ -17,12 +17,13 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "soundsettings.h" | 21 | #include "soundsettings.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | using namespace Opie::Core; | ||
25 | OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<SoundSettings> ) |
26 | 27 | ||
27 | 28 | ||
28 | 29 | ||
diff --git a/noncore/settings/sshkeys/sshkeys.cpp b/noncore/settings/sshkeys/sshkeys.cpp index e76fd6b..31f6b85 100644 --- a/noncore/settings/sshkeys/sshkeys.cpp +++ b/noncore/settings/sshkeys/sshkeys.cpp | |||
@@ -28,33 +28,34 @@ | |||
28 | 28 | ||
29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
30 | #include <sys/stat.h> | 30 | #include <sys/stat.h> |
31 | #include <stdlib.h> | 31 | #include <stdlib.h> |
32 | #include <unistd.h> | 32 | #include <unistd.h> |
33 | #include <stdio.h> | 33 | #include <stdio.h> |
34 | #include <ctype.h> | 34 | #include <ctype.h> |
35 | 35 | ||
36 | using namespace Opie::Core; | ||
36 | static char *keynames[] = { "identity", "id_rsa", "id_dsa" }; | 37 | static char *keynames[] = { "identity", "id_rsa", "id_dsa" }; |
37 | 38 | ||
38 | SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) | 39 | SSHKeysApp::SSHKeysApp( QWidget* parent, const char* name, WFlags fl ) |
39 | : SSHKeysBase( parent, name, fl ) | 40 | : SSHKeysBase( parent, name, fl ) |
40 | { | 41 | { |
41 | char *home = getenv("HOME"); | 42 | char *home = getenv("HOME"); |
42 | unsigned i; | 43 | unsigned i; |
43 | 44 | ||
44 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); | 45 | connect(AddButton, SIGNAL(clicked()), this, SLOT(doAddButton())); |
45 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); | 46 | connect(RefreshListButton, SIGNAL(clicked()), this, SLOT(doRefreshListButton())); |
46 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); | 47 | connect(RemoveAllButton, SIGNAL(clicked()), this, SLOT(doRemoveAllButton())); |
47 | 48 | ||
48 | connect(&addprocess, SIGNAL(receivedStdout(OProcess*,char*,int)), | 49 | connect(&addprocess, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
49 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 50 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); |
50 | connect(&addprocess, SIGNAL(receivedStderr(OProcess*,char*,int)), | 51 | connect(&addprocess, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
51 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 52 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); |
52 | connect(&addprocess, SIGNAL(processExited(OProcess*)), | 53 | connect(&addprocess, SIGNAL(processExited(Opie::Core::OProcess*)), |
53 | this, SLOT(ssh_add_exited(OProcess*))); | 54 | this, SLOT(ssh_add_exited(OProcess*))); |
54 | 55 | ||
55 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), | 56 | connect(KeyFileName, SIGNAL(textChanged(const QString&)), |
56 | this, SLOT(add_text_changed(const QString&))); | 57 | this, SLOT(add_text_changed(const QString&))); |
57 | 58 | ||
58 | if (home) { | 59 | if (home) { |
59 | for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) { | 60 | for (i = 0; i < sizeof(keynames)/sizeof(keynames[0]); i++) { |
60 | char thiskeyname[32]; | 61 | char thiskeyname[32]; |
@@ -81,19 +82,19 @@ void SSHKeysApp::doRefreshListButton() | |||
81 | 82 | ||
82 | while(t) { | 83 | while(t) { |
83 | QListViewItem *next = t->nextSibling(); | 84 | QListViewItem *next = t->nextSibling(); |
84 | KeyList->takeItem(t); | 85 | KeyList->takeItem(t); |
85 | delete(t); | 86 | delete(t); |
86 | t = next; | 87 | t = next; |
87 | } | 88 | } |
88 | 89 | ||
89 | connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), | 90 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
90 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); | 91 | this, SLOT(get_list_keys_output(OProcess*,char*,int))); |
91 | connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), | 92 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
92 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 93 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); |
93 | 94 | ||
94 | keystate = KeySize; | 95 | keystate = KeySize; |
95 | incoming_keyname=""; | 96 | incoming_keyname=""; |
96 | incoming_keysize=""; | 97 | incoming_keysize=""; |
97 | incoming_keyfingerprint=""; | 98 | incoming_keyfingerprint=""; |
98 | 99 | ||
99 | // log_text("Running ssh-add -l"); | 100 | // log_text("Running ssh-add -l"); |
@@ -272,19 +273,19 @@ void SSHKeysApp::log_text(const char *text) | |||
272 | TextOutput->append(text); | 273 | TextOutput->append(text); |
273 | TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE); | 274 | TextOutput->setCursorPosition(TextOutput->numLines()+1, 0, FALSE); |
274 | } | 275 | } |
275 | 276 | ||
276 | void SSHKeysApp::doRemoveAllButton() | 277 | void SSHKeysApp::doRemoveAllButton() |
277 | { | 278 | { |
278 | OProcess sshadd_process; | 279 | OProcess sshadd_process; |
279 | 280 | ||
280 | connect(&sshadd_process, SIGNAL(receivedStdout(OProcess*,char*,int)), | 281 | connect(&sshadd_process, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), |
281 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); | 282 | this, SLOT(log_sshadd_output(OProcess*,char*,int))); |
282 | connect(&sshadd_process, SIGNAL(receivedStderr(OProcess*,char*,int)), | 283 | connect(&sshadd_process, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), |
283 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); | 284 | this, SLOT(log_sshadd_stderr(OProcess*,char*,int))); |
284 | 285 | ||
285 | // log_text(tr("Running ssh-add -D")); | 286 | // log_text(tr("Running ssh-add -D")); |
286 | sshadd_process << "ssh-add" << "-D"; | 287 | sshadd_process << "ssh-add" << "-D"; |
287 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); | 288 | bool ret = sshadd_process.start(OProcess::Block, OProcess::AllOutput); |
288 | if (!ret) { | 289 | if (!ret) { |
289 | log_text(tr("Error running ssh-add")); | 290 | log_text(tr("Error running ssh-add")); |
290 | } | 291 | } |
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 | |||
@@ -38,24 +38,24 @@ class SSHKeysApp : public SSHKeysBase | |||
38 | void log_text(const char *text); | 38 | void log_text(const char *text); |
39 | void flush_sshadd_output(void); | 39 | void flush_sshadd_output(void); |
40 | 40 | ||
41 | enum { Noise, KeyName, KeySize, KeyFingerprint } keystate; | 41 | enum { Noise, KeyName, KeySize, KeyFingerprint } keystate; |
42 | QString incoming_keyname; | 42 | QString incoming_keyname; |
43 | QString incoming_keysize; | 43 | QString incoming_keysize; |
44 | QString incoming_keyfingerprint; | 44 | QString incoming_keyfingerprint; |
45 | QString incoming_noise; | 45 | QString incoming_noise; |
46 | OProcess addprocess; | 46 | Opie::Core::OProcess addprocess; |
47 | QString pending_stdout; | 47 | QString pending_stdout; |
48 | QString pending_stderr; | 48 | QString pending_stderr; |
49 | 49 | ||
50 | private slots: | 50 | private slots: |
51 | void doAddButton(); | 51 | void doAddButton(); |
52 | void doRefreshListButton(); | 52 | void doRefreshListButton(); |
53 | void doRemoveAllButton(); | 53 | void doRemoveAllButton(); |
54 | void get_list_keys_output(OProcess *proc, char *buffer, int buflen); | 54 | void get_list_keys_output(Opie::Core::OProcess *proc, char *buffer, int buflen); |
55 | void log_sshadd_output(OProcess *proc, char *buffer, int buflen); | 55 | void log_sshadd_output(Opie::Core::OProcess *proc, char *buffer, int buflen); |
56 | void log_sshadd_stderr(OProcess *proc, char *buffer, int buflen); | 56 | void log_sshadd_stderr(Opie::Core::OProcess *proc, char *buffer, int buflen); |
57 | void ssh_add_exited(OProcess *proc); | 57 | void ssh_add_exited(Opie::Core::OProcess *proc); |
58 | void add_text_changed(const QString &text); | 58 | void add_text_changed(const QString &text); |
59 | }; | 59 | }; |
60 | #endif | 60 | #endif |
61 | 61 | ||
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index 3c2c15f..2a52b00 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp | |||
@@ -46,17 +46,20 @@ | |||
46 | #include <time.h> | 46 | #include <time.h> |
47 | #include <stdio.h> | 47 | #include <stdio.h> |
48 | #include <stdlib.h> | 48 | #include <stdlib.h> |
49 | #include <math.h> | 49 | #include <math.h> |
50 | #if defined (__GNUC__) && (__GNUC__ < 3) | 50 | #if defined (__GNUC__) && (__GNUC__ < 3) |
51 | extern double round(double); | 51 | extern double round(double); |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | using namespace Opie::Ui; | ||
55 | using namespace Opie::Core; | ||
54 | extern "C" | 56 | extern "C" |
57 | |||
55 | { | 58 | { |
56 | void BenchFFT( void ); | 59 | void BenchFFT( void ); |
57 | double dhry_main( int ); | 60 | double dhry_main( int ); |
58 | } | 61 | } |
59 | 62 | ||
60 | #define DHRYSTONE_RUNS 20000000 | 63 | #define DHRYSTONE_RUNS 20000000 |
61 | #define TEST_DURATION 3 | 64 | #define TEST_DURATION 3 |
62 | 65 | ||
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 | |||
@@ -18,52 +18,52 @@ | |||
18 | 18 | ||
19 | #include <qwidget.h> | 19 | #include <qwidget.h> |
20 | #include <qdialog.h> | 20 | #include <qdialog.h> |
21 | #include <qdict.h> | 21 | #include <qdict.h> |
22 | #include <qstringlist.h> | 22 | #include <qstringlist.h> |
23 | 23 | ||
24 | class QClipboard; | 24 | class QClipboard; |
25 | class QComboBox; | 25 | class QComboBox; |
26 | class OCheckListItem; | 26 | namespace Opie {namespace Ui {class OCheckListItem;}} |
27 | class QPushButton; | 27 | class QPushButton; |
28 | class OListView; | 28 | namespace Opie {namespace Ui {class OListView;}} |
29 | 29 | ||
30 | class BenchmarkInfo : public QWidget | 30 | class BenchmarkInfo : public QWidget |
31 | { | 31 | { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | 33 | ||
34 | public: | 34 | public: |
35 | BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 ); | 35 | BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 ); |
36 | ~BenchmarkInfo(); | 36 | ~BenchmarkInfo(); |
37 | 37 | ||
38 | OCheckListItem* test_alu; | 38 | Opie::Ui::OCheckListItem* test_alu; |
39 | OCheckListItem* test_fpu; | 39 | Opie::Ui::OCheckListItem* test_fpu; |
40 | OCheckListItem* test_txt; | 40 | Opie::Ui::OCheckListItem* test_txt; |
41 | OCheckListItem* test_gfx; | 41 | Opie::Ui::OCheckListItem* test_gfx; |
42 | OCheckListItem* test_ram; | 42 | Opie::Ui::OCheckListItem* test_ram; |
43 | OCheckListItem* test_sd; | 43 | Opie::Ui::OCheckListItem* test_sd; |
44 | OCheckListItem* test_cf; | 44 | Opie::Ui::OCheckListItem* test_cf; |
45 | 45 | ||
46 | bool main_rd; | 46 | bool main_rd; |
47 | bool main_wt; | 47 | bool main_wt; |
48 | bool sd_rd; | 48 | bool sd_rd; |
49 | bool sd_wt; | 49 | bool sd_wt; |
50 | bool cf_rd; | 50 | bool cf_rd; |
51 | bool cf_wt; | 51 | bool cf_wt; |
52 | 52 | ||
53 | QClipboard* clb; | 53 | QClipboard* clb; |
54 | QComboBox* machineCombo; | 54 | QComboBox* machineCombo; |
55 | OListView* tests; | 55 | Opie::Ui::OListView* tests; |
56 | QPushButton* startButton; | 56 | QPushButton* startButton; |
57 | QDict <QStringList> machines; | 57 | QDict <QStringList> machines; |
58 | 58 | ||
59 | int textRendering( int ); | 59 | int textRendering( int ); |
60 | int gfxRendering( int ); | 60 | int gfxRendering( int ); |
61 | void performFileTest( const QString& fname, OCheckListItem* item ); | 61 | void performFileTest( const QString& fname, Opie::Ui::OCheckListItem* item ); |
62 | 62 | ||
63 | private slots: | 63 | private slots: |
64 | bool writeFile( const QString& ); | 64 | bool writeFile( const QString& ); |
65 | bool readFile( const QString& ); | 65 | bool readFile( const QString& ); |
66 | void run(); | 66 | void run(); |
67 | void machineActivated( int ); | 67 | void machineActivated( int ); |
68 | }; | 68 | }; |
69 | 69 | ||
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 | |||
@@ -18,9 +18,10 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "sysinfo.h" | 21 | #include "sysinfo.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | 25 | ||
26 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<SystemInfo> ) | 27 | 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 | |||
@@ -31,16 +31,17 @@ | |||
31 | #include <qfile.h> | 31 | #include <qfile.h> |
32 | #include <qlayout.h> | 32 | #include <qlayout.h> |
33 | #include <qmessagebox.h> | 33 | #include <qmessagebox.h> |
34 | #include <qpushbutton.h> | 34 | #include <qpushbutton.h> |
35 | #include <qtextview.h> | 35 | #include <qtextview.h> |
36 | #include <qtimer.h> | 36 | #include <qtimer.h> |
37 | #include <qwhatsthis.h> | 37 | #include <qwhatsthis.h> |
38 | 38 | ||
39 | using namespace Opie::Ui; | ||
39 | ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) | 40 | ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) |
40 | : QWidget( parent, name, fl ) | 41 | : QWidget( parent, name, fl ) |
41 | { | 42 | { |
42 | QGridLayout *layout = new QGridLayout( this ); | 43 | QGridLayout *layout = new QGridLayout( this ); |
43 | layout->setSpacing( 4 ); | 44 | layout->setSpacing( 4 ); |
44 | layout->setMargin( 4 ); | 45 | layout->setMargin( 4 ); |
45 | 46 | ||
46 | ModulesView = new OListView( this ); | 47 | ModulesView = new OListView( this ); |
@@ -53,18 +54,18 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) | |||
53 | ModulesView->setAllColumnsShowFocus( TRUE ); | 54 | ModulesView->setAllColumnsShowFocus( TRUE ); |
54 | layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 ); | 55 | layout->addMultiCellWidget( ModulesView, 0, 0, 0, 1 ); |
55 | 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." ) ); | 56 | 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." ) ); |
56 | 57 | ||
57 | // Test if we have /sbin/modinfo, and if so, allow module detail window | 58 | // Test if we have /sbin/modinfo, and if so, allow module detail window |
58 | if ( QFile::exists( "/sbin/modinfo" ) ) | 59 | if ( QFile::exists( "/sbin/modinfo" ) ) |
59 | { | 60 | { |
60 | QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold ); | 61 | QPEApplication::setStylusOperation( ModulesView->viewport(), QPEApplication::RightOnHold ); |
61 | connect( ModulesView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ), | 62 | connect( ModulesView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ), |
62 | this, SLOT( viewModules(OListViewItem*) ) ); | 63 | this, SLOT( viewModules(QListViewItem*) ) ); |
63 | } | 64 | } |
64 | 65 | ||
65 | CommandCB = new QComboBox( FALSE, this ); | 66 | CommandCB = new QComboBox( FALSE, this ); |
66 | CommandCB->insertItem( "modprobe -r" ); | 67 | CommandCB->insertItem( "modprobe -r" ); |
67 | CommandCB->insertItem( "rmmod" ); | 68 | CommandCB->insertItem( "rmmod" ); |
68 | // I can't think of other useful commands yet. Anyone? | 69 | // I can't think of other useful commands yet. Anyone? |
69 | layout->addWidget( CommandCB, 1, 0 ); | 70 | layout->addWidget( CommandCB, 1, 0 ); |
70 | QWhatsThis::add( CommandCB, tr( "Select a command here and then click the Send button to the right to send the command to module selected above." ) ); | 71 | QWhatsThis::add( CommandCB, tr( "Select a command here and then click the Send button to the right to send the command to module selected above." ) ); |
@@ -158,16 +159,21 @@ void ModulesInfo::slotSendClicked() | |||
158 | 159 | ||
159 | FILE* stream = popen( command, "r" ); | 160 | FILE* stream = popen( command, "r" ); |
160 | if ( stream ) | 161 | if ( stream ) |
161 | pclose( stream ); | 162 | pclose( stream ); |
162 | } | 163 | } |
163 | 164 | ||
164 | } | 165 | } |
165 | 166 | ||
167 | void ModulesInfo::viewModules( QListViewItem *module ) { | ||
168 | if ( !module ) | ||
169 | return; | ||
170 | viewModules( static_cast<OListViewItem*>( module ) ); | ||
171 | } | ||
166 | void ModulesInfo::viewModules( OListViewItem *modules ) | 172 | void ModulesInfo::viewModules( OListViewItem *modules ) |
167 | { | 173 | { |
168 | QString modname = modules->text( 0 ); | 174 | QString modname = modules->text( 0 ); |
169 | QString capstr = "Module: "; | 175 | QString capstr = "Module: "; |
170 | capstr.append( modname ); | 176 | capstr.append( modname ); |
171 | ModulesDtl->setCaption( capstr ); | 177 | ModulesDtl->setCaption( capstr ); |
172 | QString command = "/sbin/modinfo "; | 178 | QString command = "/sbin/modinfo "; |
173 | command.append( modname ); | 179 | command.append( modname ); |
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 | |||
@@ -21,31 +21,33 @@ | |||
21 | 21 | ||
22 | #ifndef MODULESINFO_H | 22 | #ifndef MODULESINFO_H |
23 | #define MODULESINFO_H | 23 | #define MODULESINFO_H |
24 | 24 | ||
25 | #include <qwidget.h> | 25 | #include <qwidget.h> |
26 | 26 | ||
27 | class Detail; | 27 | class Detail; |
28 | class QComboBox; | 28 | class QComboBox; |
29 | class OListView; | 29 | class QListViewItem; |
30 | class OListViewItem; | 30 | namespace Opie {namespace Ui {class OListView;}} |
31 | namespace Opie {namespace Ui {class OListViewItem;}} | ||
31 | 32 | ||
32 | class ModulesInfo : public QWidget | 33 | class ModulesInfo : public QWidget |
33 | { | 34 | { |
34 | Q_OBJECT | 35 | Q_OBJECT |
35 | public: | 36 | public: |
36 | ModulesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 37 | ModulesInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
37 | ~ModulesInfo(); | 38 | ~ModulesInfo(); |
38 | 39 | ||
39 | private: | 40 | private: |
40 | OListView* ModulesView; | 41 | Opie::Ui::OListView* ModulesView; |
41 | QComboBox* CommandCB; | 42 | QComboBox* CommandCB; |
42 | 43 | ||
43 | Detail* ModulesDtl; | 44 | Detail* ModulesDtl; |
44 | 45 | ||
45 | private slots: | 46 | private slots: |
46 | void updateData(); | 47 | void updateData(); |
47 | void slotSendClicked(); | 48 | void slotSendClicked(); |
48 | void viewModules( OListViewItem * ); | 49 | void viewModules( QListViewItem* ); |
50 | void viewModules( Opie::Ui::OListViewItem * ); | ||
49 | }; | 51 | }; |
50 | 52 | ||
51 | #endif | 53 | #endif |
diff --git a/noncore/settings/sysinfo/processinfo.cpp b/noncore/settings/sysinfo/processinfo.cpp index dd9a05d..e887267 100644 --- a/noncore/settings/sysinfo/processinfo.cpp +++ b/noncore/settings/sysinfo/processinfo.cpp | |||
@@ -33,16 +33,17 @@ | |||
33 | #include <qtextview.h> | 33 | #include <qtextview.h> |
34 | #include <qtimer.h> | 34 | #include <qtimer.h> |
35 | #include <qwhatsthis.h> | 35 | #include <qwhatsthis.h> |
36 | 36 | ||
37 | /* STD */ | 37 | /* STD */ |
38 | #include <sys/types.h> | 38 | #include <sys/types.h> |
39 | #include <signal.h> | 39 | #include <signal.h> |
40 | 40 | ||
41 | using namespace Opie::Ui; | ||
41 | ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl ) | 42 | ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl ) |
42 | : QWidget( parent, name, fl ) | 43 | : QWidget( parent, name, fl ) |
43 | { | 44 | { |
44 | QGridLayout *layout = new QGridLayout( this ); | 45 | QGridLayout *layout = new QGridLayout( this ); |
45 | layout->setSpacing( 4 ); | 46 | layout->setSpacing( 4 ); |
46 | layout->setMargin( 4 ); | 47 | layout->setMargin( 4 ); |
47 | 48 | ||
48 | 49 | ||
@@ -50,18 +51,18 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl ) | |||
50 | int colnum = ProcessView->addColumn( tr( "PID" ) ); | 51 | int colnum = ProcessView->addColumn( tr( "PID" ) ); |
51 | ProcessView->setColumnAlignment( colnum, Qt::AlignRight ); | 52 | ProcessView->setColumnAlignment( colnum, Qt::AlignRight ); |
52 | colnum = ProcessView->addColumn( tr( "Command" ),96 ); | 53 | colnum = ProcessView->addColumn( tr( "Command" ),96 ); |
53 | colnum = ProcessView->addColumn( tr( "Status" ) ); | 54 | colnum = ProcessView->addColumn( tr( "Status" ) ); |
54 | colnum = ProcessView->addColumn( tr( "Time" ) ); | 55 | colnum = ProcessView->addColumn( tr( "Time" ) ); |
55 | ProcessView->setColumnAlignment( colnum, Qt::AlignRight ); | 56 | ProcessView->setColumnAlignment( colnum, Qt::AlignRight ); |
56 | ProcessView->setAllColumnsShowFocus( TRUE ); | 57 | ProcessView->setAllColumnsShowFocus( TRUE ); |
57 | QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold ); | 58 | QPEApplication::setStylusOperation( ProcessView->viewport(), QPEApplication::RightOnHold ); |
58 | connect( ProcessView, SIGNAL( rightButtonPressed(OListViewItem*,const QPoint&,int) ), | 59 | connect( ProcessView, SIGNAL( rightButtonPressed(QListViewItem*,const QPoint&,int) ), |
59 | this, SLOT( viewProcess(OListViewItem*) ) ); | 60 | this, SLOT( viewProcess(QListViewItem*) ) ); |
60 | layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 ); | 61 | layout->addMultiCellWidget( ProcessView, 0, 0, 0, 1 ); |
61 | QWhatsThis::add( ProcessView, tr( "This is a list of all the processes on this handheld device.\n\nClick and hold on a process to see additional information about the process, or to send a signal to it." ) ); | 62 | QWhatsThis::add( ProcessView, tr( "This is a list of all the processes on this handheld device.\n\nClick and hold on a process to see additional information about the process, or to send a signal to it." ) ); |
62 | 63 | ||
63 | SignalCB = new QComboBox( FALSE, this, "SignalCB" ); | 64 | SignalCB = new QComboBox( FALSE, this, "SignalCB" ); |
64 | SignalCB->insertItem( " 1: SIGHUP" ); | 65 | SignalCB->insertItem( " 1: SIGHUP" ); |
65 | SignalCB->insertItem( " 2: SIGINT" ); | 66 | SignalCB->insertItem( " 2: SIGINT" ); |
66 | SignalCB->insertItem( " 3: SIGQUIT" ); | 67 | SignalCB->insertItem( " 3: SIGQUIT" ); |
67 | SignalCB->insertItem( " 5: SIGTRAP" ); | 68 | SignalCB->insertItem( " 5: SIGTRAP" ); |
@@ -180,16 +181,22 @@ void ProcessInfo::slotSendClicked() | |||
180 | sigstr.truncate(2); | 181 | sigstr.truncate(2); |
181 | int sigid = sigstr.toUInt(); | 182 | int sigid = sigstr.toUInt(); |
182 | kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid ); | 183 | kill( currprocess->text( 0 ).stripWhiteSpace().toUInt(), sigid ); |
183 | } | 184 | } |
184 | } | 185 | } |
185 | 186 | ||
186 | } | 187 | } |
187 | 188 | ||
189 | void ProcessInfo::viewProcess( QListViewItem* process ) { | ||
190 | if ( !process ) | ||
191 | return; | ||
192 | viewProcess( static_cast<OListViewItem*>( process ) ); | ||
193 | } | ||
194 | |||
188 | void ProcessInfo::viewProcess( OListViewItem *process ) | 195 | void ProcessInfo::viewProcess( OListViewItem *process ) |
189 | { | 196 | { |
190 | QString pid= process->text( 0 ).stripWhiteSpace(); | 197 | QString pid= process->text( 0 ).stripWhiteSpace(); |
191 | QString command = process->text( 1 ); | 198 | QString command = process->text( 1 ); |
192 | ProcessDtl->setCaption( pid + " - " + command ); | 199 | ProcessDtl->setCaption( pid + " - " + command ); |
193 | FILE *statfile = fopen( ( QString ) ( "/proc/" + pid + "/status"), "r"); | 200 | FILE *statfile = fopen( ( QString ) ( "/proc/" + pid + "/status"), "r"); |
194 | if ( statfile ) | 201 | if ( statfile ) |
195 | { | 202 | { |
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 | |||
@@ -19,32 +19,34 @@ | |||
19 | 19 | ||
20 | #ifndef PROCESSINFO_H | 20 | #ifndef PROCESSINFO_H |
21 | #define PROCESSINFO_H | 21 | #define PROCESSINFO_H |
22 | 22 | ||
23 | #include <qwidget.h> | 23 | #include <qwidget.h> |
24 | 24 | ||
25 | class Detail; | 25 | class Detail; |
26 | class QComboBox; | 26 | class QComboBox; |
27 | class OListView; | 27 | class QListViewItem; |
28 | class OListViewItem; | 28 | namespace Opie {namespace Ui {class OListView;}} |
29 | namespace Opie {namespace Ui {class OListViewItem;}} | ||
29 | 30 | ||
30 | class ProcessInfo : public QWidget | 31 | class ProcessInfo : public QWidget |
31 | { | 32 | { |
32 | Q_OBJECT | 33 | Q_OBJECT |
33 | public: | 34 | public: |
34 | ProcessInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); | 35 | ProcessInfo( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); |
35 | ~ProcessInfo(); | 36 | ~ProcessInfo(); |
36 | 37 | ||
37 | private: | 38 | private: |
38 | OListView* ProcessView; | 39 | Opie::Ui::OListView* ProcessView; |
39 | QComboBox* SignalCB; | 40 | QComboBox* SignalCB; |
40 | QPushButton* SendButton; | 41 | QPushButton* SendButton; |
41 | 42 | ||
42 | Detail *ProcessDtl; | 43 | Detail *ProcessDtl; |
43 | 44 | ||
44 | private slots: | 45 | private slots: |
45 | void updateData(); | 46 | void updateData(); |
46 | void slotSendClicked(); | 47 | void slotSendClicked(); |
47 | void viewProcess( OListViewItem * ); | 48 | void viewProcess( QListViewItem* ); |
49 | void viewProcess( Opie::Ui::OListViewItem * ); | ||
48 | }; | 50 | }; |
49 | 51 | ||
50 | #endif | 52 | #endif |
diff --git a/noncore/settings/sysinfo/sysinfo.cpp b/noncore/settings/sysinfo/sysinfo.cpp index fda6352..4c58999 100644 --- a/noncore/settings/sysinfo/sysinfo.cpp +++ b/noncore/settings/sysinfo/sysinfo.cpp | |||
@@ -33,16 +33,17 @@ | |||
33 | 33 | ||
34 | #include <opie2/otabwidget.h> | 34 | #include <opie2/otabwidget.h> |
35 | 35 | ||
36 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
37 | #include <qpe/resource.h> | 37 | #include <qpe/resource.h> |
38 | 38 | ||
39 | #include <qlayout.h> | 39 | #include <qlayout.h> |
40 | 40 | ||
41 | using namespace Opie::Ui; | ||
41 | SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) | 42 | SystemInfo::SystemInfo( QWidget *parent, const char *name, WFlags ) |
42 | : QWidget( parent, name, WStyle_ContextHelp ) | 43 | : QWidget( parent, name, WStyle_ContextHelp ) |
43 | { | 44 | { |
44 | setIcon( Resource::loadPixmap( "system_icon" ) ); | 45 | setIcon( Resource::loadPixmap( "system_icon" ) ); |
45 | setCaption( tr("System Info") ); | 46 | setCaption( tr("System Info") ); |
46 | 47 | ||
47 | resize( 220, 180 ); | 48 | resize( 220, 180 ); |
48 | 49 | ||
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 | |||
@@ -28,17 +28,17 @@ | |||
28 | /* QT */ | 28 | /* QT */ |
29 | #include <qfile.h> | 29 | #include <qfile.h> |
30 | #include <qlabel.h> | 30 | #include <qlabel.h> |
31 | #include <qlayout.h> | 31 | #include <qlayout.h> |
32 | #include <qscrollview.h> | 32 | #include <qscrollview.h> |
33 | #include <qtextstream.h> | 33 | #include <qtextstream.h> |
34 | #include <qwhatsthis.h> | 34 | #include <qwhatsthis.h> |
35 | 35 | ||
36 | using namespace Opie; | 36 | using namespace Opie::Core; |
37 | 37 | ||
38 | VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) | 38 | VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f ) |
39 | : QWidget( parent, name, f ) | 39 | : QWidget( parent, name, f ) |
40 | { | 40 | { |
41 | setMinimumSize( 200, 150 ); | 41 | setMinimumSize( 200, 150 ); |
42 | 42 | ||
43 | QVBoxLayout *tmpvb = new QVBoxLayout( this ); | 43 | QVBoxLayout *tmpvb = new QVBoxLayout( this ); |
44 | QScrollView *sv = new QScrollView( this ); | 44 | QScrollView *sv = new QScrollView( this ); |
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 | |||
@@ -6,9 +6,10 @@ | |||
6 | * (at your option) any later version. * | 6 | * (at your option) any later version. * |
7 | * * | 7 | * * |
8 | ***************************************************************************/ | 8 | ***************************************************************************/ |
9 | 9 | ||
10 | #include "usermanager.h" | 10 | #include "usermanager.h" |
11 | 11 | ||
12 | #include <opie2/oapplicationfactory.h> | 12 | #include <opie2/oapplicationfactory.h> |
13 | 13 | ||
14 | using namespace Opie::Core; | ||
14 | OPIE_EXPORT_APP( OApplicationFactory<UserConfig> ) | 15 | 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 | |||
@@ -22,23 +22,24 @@ | |||
22 | 22 | ||
23 | /* STD */ | 23 | /* STD */ |
24 | #include <sys/types.h> | 24 | #include <sys/types.h> |
25 | #include <sys/wait.h> | 25 | #include <sys/wait.h> |
26 | #include <unistd.h> | 26 | #include <unistd.h> |
27 | #include <signal.h> | 27 | #include <signal.h> |
28 | 28 | ||
29 | 29 | ||
30 | using namespace Opie; | 30 | using namespace Opie::Core; |
31 | 31 | ||
32 | 32 | ||
33 | /** | 33 | /** |
34 | * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups. | 34 | * UserDialog constructor. Setup the dialog, fill the groupComboBox & groupsListView with all groups. |
35 | * | 35 | * |
36 | */ | 36 | */ |
37 | using namespace Opie::Ui; | ||
37 | UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) | 38 | UserDialog::UserDialog(int viewmode, QWidget* parent, const char* name, bool modal, WFlags fl) : QDialog(parent, name, modal, fl) |
38 | { | 39 | { |
39 | vm=viewmode; | 40 | vm=viewmode; |
40 | QVBoxLayout *layout = new QVBoxLayout(this); | 41 | QVBoxLayout *layout = new QVBoxLayout(this); |
41 | myTabWidget=new QTabWidget(this,"User Tab Widget"); | 42 | myTabWidget=new QTabWidget(this,"User Tab Widget"); |
42 | layout->addWidget(myTabWidget); | 43 | layout->addWidget(myTabWidget); |
43 | setupTab1(); | 44 | setupTab1(); |
44 | setupTab2(); | 45 | setupTab2(); |