summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/tools/clock/clock.pro2
-rw-r--r--noncore/tools/clock/config.in2
-rw-r--r--noncore/tools/clock/main.cpp3
-rw-r--r--noncore/tools/clock/opie-clock.control2
-rw-r--r--noncore/tools/clock/setAlarm.cpp8
5 files changed, 8 insertions, 9 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
@@ -4,7 +4,7 @@ SOURCES = clock.cpp setAlarm.cpp \
4 main.cpp 4 main.cpp
5INCLUDEPATH += $(OPIEDIR)/include 5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 6DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lqpe -lopie -lpthread 7LIBS += -lqpe -lopiecore2 -lopieui2 -lpthread
8TARGET = clock 8TARGET = clock
9 9
10include ( $(OPIEDIR)/include.pro ) 10include ( $(OPIEDIR)/include.pro )
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
@@ -1,4 +1,4 @@
1 config CLOCK 1 config CLOCK
2 boolean "opie-clock (clock and stop-watch)" 2 boolean "opie-clock (clock and stop-watch)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 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
@@ -20,8 +20,7 @@
20 20
21#include "clock.h" 21#include "clock.h"
22 22
23#include <qpe/qpeapplication.h> 23#include <opie2/oapplicationfactory.h>
24#include <opie/oapplicationfactory.h>
25 24
26 25
27OPIE_EXPORT_APP( OApplicationFactory<Clock> ) 26OPIE_EXPORT_APP( OApplicationFactory<Clock> )
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
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/applications 4Section: opie/applications
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal, libopiecore2, libopieui2
8Description: Clock and stop-watch 8Description: Clock and stop-watch
9 A simple clock and stop-watch for the Opie environment. 9 A simple clock and stop-watch for the Opie environment.
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $QPE_VERSION$EXTRAVERSION
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
@@ -14,8 +14,8 @@
14 14
15#include "setAlarm.h" 15#include "setAlarm.h"
16 16
17#include <opie/ofileselector.h> 17#include <opie2/ofileselector.h>
18#include <opie/ofiledialog.h> 18#include <opie2/ofiledialog.h>
19 19
20#include <qpe/config.h> 20#include <qpe/config.h>
21#include <qpe/qpeapplication.h> 21#include <qpe/qpeapplication.h>
@@ -209,8 +209,8 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
209 QStringList text; 209 QStringList text;
210 text << "audio/*"; 210 text << "audio/*";
211 map.insert(tr("Audio"), text ); 211 map.insert(tr("Audio"), text );
212 QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this ); 212 QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
213// QString str = OFileDialog::getOpenFileName( 2,"/");//,"", "*", this ); 213// QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
214 if(!str.isEmpty() ) { 214 if(!str.isEmpty() ) {
215 qDebug(str); 215 qDebug(str);
216 config.writeEntry("mp3Alarm",1); 216 config.writeEntry("mp3Alarm",1);