author | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
commit | 8a243adc61fc9c8a48fa9061f0eba12c7b345d70 (patch) (unidiff) | |
tree | 8f240482113d5588c4fb73769a2ced2ccdb87fb9 /noncore/tools/clock | |
parent | 346288b5a95b72a84fabe9acb2e32aa8a8388c8c (diff) | |
download | opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.zip opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.tar.gz opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.tar.bz2 |
Opie2 and ODP changes
Also try to make signals/slots syntax obey the namespaces
-rw-r--r-- | noncore/tools/clock/clock.cpp | 3 | ||||
-rw-r--r-- | noncore/tools/clock/main.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/clock/setAlarm.cpp | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp index b780675..485354b 100644 --- a/noncore/tools/clock/clock.cpp +++ b/noncore/tools/clock/clock.cpp | |||
@@ -53,12 +53,13 @@ | |||
53 | #include <pthread.h> | 53 | #include <pthread.h> |
54 | 54 | ||
55 | 55 | ||
56 | const double deg2rad = 0.017453292519943295769; // pi/180 | 56 | const double deg2rad = 0.017453292519943295769; // pi/180 |
57 | const int sw_prec = 2; | 57 | const int sw_prec = 2; |
58 | 58 | ||
59 | using namespace Opie::Ui; | ||
59 | void startPlayer() | 60 | void startPlayer() |
60 | { | 61 | { |
61 | Config config( "qpe" ); | 62 | Config config( "qpe" ); |
62 | config.setGroup( "Time" ); | 63 | config.setGroup( "Time" ); |
63 | sleep(15); | 64 | sleep(15); |
64 | QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" ); | 65 | QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" ); |
@@ -142,13 +143,13 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) | |||
142 | 143 | ||
143 | alarmBtn = new QPushButton ( controls ); | 144 | alarmBtn = new QPushButton ( controls ); |
144 | gl->addWidget( alarmBtn, 1, 2 ); | 145 | gl->addWidget( alarmBtn, 1, 2 ); |
145 | 146 | ||
146 | alarmBtn->setText( tr( "Set Alarm" ) ); | 147 | alarmBtn->setText( tr( "Set Alarm" ) ); |
147 | 148 | ||
148 | Opie::OClickableLabel *click = new Opie::OClickableLabel( controls, "label" ); | 149 | OClickableLabel *click = new Opie::Ui::OClickableLabel( controls, "label" ); |
149 | click->setText( tr( "Set date and time." ) ); | 150 | click->setText( tr( "Set date and time." ) ); |
150 | gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter ); | 151 | gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter ); |
151 | connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) ); | 152 | connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) ); |
152 | 153 | ||
153 | connect( set , SIGNAL( pressed() ), SLOT( slotSet() ) ); | 154 | connect( set , SIGNAL( pressed() ), SLOT( slotSet() ) ); |
154 | connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) ); | 155 | connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) ); |
diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp index 89dd1bd..237d9f0 100644 --- a/noncore/tools/clock/main.cpp +++ b/noncore/tools/clock/main.cpp | |||
@@ -20,7 +20,9 @@ | |||
20 | 20 | ||
21 | #include "clock.h" | 21 | #include "clock.h" |
22 | 22 | ||
23 | #include <opie2/oapplicationfactory.h> | 23 | #include <opie2/oapplicationfactory.h> |
24 | 24 | ||
25 | 25 | ||
26 | using namespace Opie::Core; | ||
27 | using namespace Opie::Core; | ||
26 | OPIE_EXPORT_APP( OApplicationFactory<Clock> ) | 28 | OPIE_EXPORT_APP( OApplicationFactory<Clock> ) |
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp index 6fec5a0..9d5fc49 100644 --- a/noncore/tools/clock/setAlarm.cpp +++ b/noncore/tools/clock/setAlarm.cpp | |||
@@ -29,12 +29,13 @@ | |||
29 | #include <qvariant.h> | 29 | #include <qvariant.h> |
30 | #include <qtooltip.h> | 30 | #include <qtooltip.h> |
31 | #include <qwhatsthis.h> | 31 | #include <qwhatsthis.h> |
32 | #include <qbuttongroup.h> | 32 | #include <qbuttongroup.h> |
33 | #include <qcheckbox.h> | 33 | #include <qcheckbox.h> |
34 | 34 | ||
35 | using namespace Opie::Ui; | ||
35 | Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl ) | 36 | Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl ) |
36 | : QDialog( parent, name, modal, fl ) | 37 | : QDialog( parent, name, modal, fl ) |
37 | { | 38 | { |
38 | if ( !name ) | 39 | if ( !name ) |
39 | setName( "Set_Alarm" ); | 40 | setName( "Set_Alarm" ); |
40 | resize( 240, 101 ); | 41 | resize( 240, 101 ); |
@@ -206,13 +207,13 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { | |||
206 | if(b) { | 207 | if(b) { |
207 | QMap<QString, QStringList> map; | 208 | QMap<QString, QStringList> map; |
208 | map.insert(tr("All"), QStringList() ); | 209 | map.insert(tr("All"), QStringList() ); |
209 | QStringList text; | 210 | QStringList text; |
210 | text << "audio/*"; | 211 | text << "audio/*"; |
211 | map.insert(tr("Audio"), text ); | 212 | map.insert(tr("Audio"), text ); |
212 | QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); | 213 | QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); |
213 | // QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); | 214 | // QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); |
214 | if(!str.isEmpty() ) { | 215 | if(!str.isEmpty() ) { |
215 | qDebug(str); | 216 | qDebug(str); |
216 | config.writeEntry("mp3Alarm",1); | 217 | config.writeEntry("mp3Alarm",1); |
217 | config.writeEntry("mp3File",str); | 218 | config.writeEntry("mp3File",str); |
218 | } | 219 | } |