author | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
commit | 8a243adc61fc9c8a48fa9061f0eba12c7b345d70 (patch) (side-by-side diff) | |
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 @@ #include <pthread.h> const double deg2rad = 0.017453292519943295769; // pi/180 const int sw_prec = 2; +using namespace Opie::Ui; void startPlayer() { Config config( "qpe" ); config.setGroup( "Time" ); sleep(15); QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" ); @@ -142,13 +143,13 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f ) alarmBtn = new QPushButton ( controls ); gl->addWidget( alarmBtn, 1, 2 ); alarmBtn->setText( tr( "Set Alarm" ) ); - Opie::OClickableLabel *click = new Opie::OClickableLabel( controls, "label" ); + OClickableLabel *click = new Opie::Ui::OClickableLabel( controls, "label" ); click->setText( tr( "Set date and time." ) ); gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter ); connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) ); connect( set , SIGNAL( pressed() ), SLOT( slotSet() ) ); 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 @@ #include "clock.h" #include <opie2/oapplicationfactory.h> +using namespace Opie::Core; +using namespace Opie::Core; 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 @@ #include <qvariant.h> #include <qtooltip.h> #include <qwhatsthis.h> #include <qbuttongroup.h> #include <qcheckbox.h> +using namespace Opie::Ui; Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { if ( !name ) setName( "Set_Alarm" ); resize( 240, 101 ); @@ -206,13 +207,13 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { if(b) { QMap<QString, QStringList> map; map.insert(tr("All"), QStringList() ); QStringList text; text << "audio/*"; map.insert(tr("Audio"), text ); - QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); + QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); // QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); if(!str.isEmpty() ) { qDebug(str); config.writeEntry("mp3Alarm",1); config.writeEntry("mp3File",str); } |