| -rw-r--r-- | noncore/tools/clock/clock.pro | 2 | ||||
| -rw-r--r-- | noncore/tools/clock/config.in | 2 | ||||
| -rw-r--r-- | noncore/tools/clock/main.cpp | 3 | ||||
| -rw-r--r-- | noncore/tools/clock/opie-clock.control | 2 | ||||
| -rw-r--r-- | noncore/tools/clock/setAlarm.cpp | 28 |
5 files changed, 18 insertions, 19 deletions
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index d5a9949..fbe0a06 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro @@ -5,5 +5,5 @@ SOURCES = clock.cpp setAlarm.cpp \ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include -LIBS += -lqpe -lopie -lpthread +LIBS += -lqpe -lopiecore2 -lopieui2 -lpthread TARGET = clock diff --git a/noncore/tools/clock/config.in b/noncore/tools/clock/config.in index abcc8f4..ce2472f 100644 --- a/noncore/tools/clock/config.in +++ b/noncore/tools/clock/config.in @@ -2,3 +2,3 @@ boolean "opie-clock (clock and stop-watch)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp index 4a5e523..89dd1bd 100644 --- a/noncore/tools/clock/main.cpp +++ b/noncore/tools/clock/main.cpp @@ -21,6 +21,5 @@ #include "clock.h" -#include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> diff --git a/noncore/tools/clock/opie-clock.control b/noncore/tools/clock/opie-clock.control index 37991a1..3d3af67 100644 --- a/noncore/tools/clock/opie-clock.control +++ b/noncore/tools/clock/opie-clock.control @@ -5,5 +5,5 @@ Section: opie/applications Maintainer: Opie Team <opie@handhelds.org> Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2, libopieui2 Description: Clock and stop-watch A simple clock and stop-watch for the Opie environment. diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp index 7c9ded2..6fec5a0 100644 --- a/noncore/tools/clock/setAlarm.cpp +++ b/noncore/tools/clock/setAlarm.cpp @@ -5,5 +5,5 @@ // copyright : (C) 2002 by ljp // email : ljp@llornkcor.com -// +// *************************************************************************** * This program is free software; you can redistribute it and/or modify * @@ -15,6 +15,6 @@ #include "setAlarm.h" -#include <opie/ofileselector.h> -#include <opie/ofiledialog.h> +#include <opie2/ofileselector.h> +#include <opie2/ofiledialog.h> #include <qpe/config.h> @@ -38,5 +38,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl if ( !name ) setName( "Set_Alarm" ); - resize( 240, 101 ); + resize( 240, 101 ); setMaximumSize( QSize( 240, 320 ) ); move(0,45); @@ -44,5 +44,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); - Set_AlarmLayout = new QGridLayout( this ); + Set_AlarmLayout = new QGridLayout( this ); Set_AlarmLayout->setSpacing( 6 ); Set_AlarmLayout->setMargin( 11 ); @@ -77,5 +77,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl Minute_Slider->setOrientation( QSlider::Horizontal ); connect(Minute_Slider, SIGNAL( valueChanged(int)),this,SLOT(slotChangeMinute(int))); - + Set_AlarmLayout->addMultiCellWidget( Minute_Slider, 2, 2, 1, 2 ); @@ -91,5 +91,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl Am_RadioButton->setChecked(TRUE); connect( Am_RadioButton, SIGNAL(toggled(bool)),this,SLOT( amButtonToggled(bool))); - + Set_AlarmLayout->addMultiCellWidget( Am_RadioButton, 0, 1, 3, 4 ); @@ -98,5 +98,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl Pm_RadioButton->setText( tr( "PM" ) ); connect( Pm_RadioButton, SIGNAL(toggled(bool)),this,SLOT( pmButtonToggled(bool))); - + Set_AlarmLayout->addMultiCellWidget(Pm_RadioButton, 1, 2, 3, 4 ); @@ -138,5 +138,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl Hour_Slider->setMaxValue( 12); Hour_Slider->setMinValue( 1); - + if( i_alarmHour > 12) { i_alarmHour = i_alarmHour - 12; @@ -144,6 +144,6 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl } else if ( i_alarmHour == 0 ) { - i_alarmHour = 12; - } + i_alarmHour = 12; + } Hour_Slider->setValue( i_alarmHour ); Minute_Slider->setValue( alarmMinute.toInt(&ok,10) ); @@ -159,5 +159,5 @@ Set_Alarm::Set_Alarm( QWidget* parent, const char* name, bool modal, WFlags fl } if( config.readBoolEntry("mp3Alarm") ) - useMp3Check->setChecked(true); + useMp3Check->setChecked(true); // signals and slots connections @@ -210,6 +210,6 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { text << "audio/*"; map.insert(tr("Audio"), text ); - QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); -// QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); + QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); +// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); if(!str.isEmpty() ) { qDebug(str); |