-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 3 | ||||
-rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.h | 22 | ||||
-rw-r--r-- | noncore/settings/sysinfo/main.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/sysinfo/modulesinfo.cpp | 10 | ||||
-rw-r--r-- | noncore/settings/sysinfo/modulesinfo.h | 10 | ||||
-rw-r--r-- | noncore/settings/sysinfo/processinfo.cpp | 11 | ||||
-rw-r--r-- | noncore/settings/sysinfo/processinfo.h | 10 | ||||
-rw-r--r-- | noncore/settings/sysinfo/sysinfo.cpp | 1 | ||||
-rw-r--r-- | noncore/settings/sysinfo/versioninfo.cpp | 2 |
9 files changed, 46 insertions, 24 deletions
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 | |||
@@ -52,5 +52,8 @@ 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 ); |
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 | |||
@@ -24,7 +24,7 @@ | |||
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 |
@@ -36,11 +36,11 @@ public: | |||
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; |
@@ -53,5 +53,5 @@ public: | |||
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; |
@@ -59,5 +59,5 @@ public: | |||
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: |
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 | |||
@@ -24,3 +24,4 @@ | |||
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 | |||
@@ -37,4 +37,5 @@ | |||
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 ) |
@@ -59,6 +60,6 @@ ModulesInfo::ModulesInfo( QWidget* parent, const char* name, WFlags fl ) | |||
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 | ||
@@ -164,4 +165,9 @@ void ModulesInfo::slotSendClicked() | |||
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 | { |
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 | |||
@@ -27,6 +27,7 @@ | |||
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 |
@@ -38,5 +39,5 @@ public: | |||
38 | 39 | ||
39 | private: | 40 | private: |
40 | OListView* ModulesView; | 41 | Opie::Ui::OListView* ModulesView; |
41 | QComboBox* CommandCB; | 42 | QComboBox* CommandCB; |
42 | 43 | ||
@@ -46,5 +47,6 @@ 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 | ||
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 | |||
@@ -39,4 +39,5 @@ | |||
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 ) |
@@ -56,6 +57,6 @@ ProcessInfo::ProcessInfo( QWidget* parent, const char* name, WFlags fl ) | |||
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." ) ); |
@@ -186,4 +187,10 @@ void ProcessInfo::slotSendClicked() | |||
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 | { |
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 | |||
@@ -25,6 +25,7 @@ | |||
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 |
@@ -36,5 +37,5 @@ public: | |||
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; |
@@ -45,5 +46,6 @@ 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 | ||
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 | |||
@@ -39,4 +39,5 @@ | |||
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 ) |
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 | |||
@@ -34,5 +34,5 @@ | |||
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 ) |