author | drw <drw> | 2004-03-02 23:27:16 (UTC) |
---|---|---|
committer | drw <drw> | 2004-03-02 23:27:16 (UTC) |
commit | 7cd53bb0080e8156914a3fd5f0666b47a8619df1 (patch) (unidiff) | |
tree | d5dcc02cdebd1b1f6fdb09f95b01ce3fa0c9675a | |
parent | 8283412db56bdbbff6df3aad0c5d6df100c9e4b6 (diff) | |
download | opie-7cd53bb0080e8156914a3fd5f0666b47a8619df1.zip opie-7cd53bb0080e8156914a3fd5f0666b47a8619df1.tar.gz opie-7cd53bb0080e8156914a3fd5f0666b47a8619df1.tar.bz2 |
Clock: libopie -> libopie2
-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 | 8 |
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 | |||
@@ -1,10 +1,10 @@ | |||
1 | CONFIG = qt warn_on release quick-app | 1 | CONFIG = qt warn_on release quick-app |
2 | HEADERS = clock.h setAlarm.h | 2 | HEADERS = clock.h setAlarm.h |
3 | SOURCES = clock.cpp setAlarm.cpp \ | 3 | SOURCES = clock.cpp setAlarm.cpp \ |
4 | main.cpp | 4 | main.cpp |
5 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
6 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
7 | LIBS += -lqpe -lopie -lpthread | 7 | LIBS += -lqpe -lopiecore2 -lopieui2 -lpthread |
8 | TARGET = clock | 8 | TARGET = clock |
9 | 9 | ||
10 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(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 | |||
@@ -17,11 +17,10 @@ | |||
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
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 | ||
27 | OPIE_EXPORT_APP( OApplicationFactory<Clock> ) | 26 | OPIE_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 | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-clock | 1 | Package: opie-clock |
2 | Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop | 2 | Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
8 | Description: Clock and stop-watch | 8 | Description: 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. |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: $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 | |||
@@ -11,14 +11,14 @@ | |||
11 | * the Free Software Foundation; either version 2 of the License, or * | 11 | * the Free Software Foundation; either version 2 of the License, or * |
12 | * (at your option) any later version. * | 12 | * (at your option) any later version. * |
13 | ***************************************************************************/ | 13 | ***************************************************************************/ |
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> |
22 | #include <qstring.h> | 22 | #include <qstring.h> |
23 | #include <qlabel.h> | 23 | #include <qlabel.h> |
24 | #include <qlcdnumber.h> | 24 | #include <qlcdnumber.h> |
@@ -206,14 +206,14 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) { | |||
206 | if(b) { | 206 | if(b) { |
207 | QMap<QString, QStringList> map; | 207 | QMap<QString, QStringList> map; |
208 | map.insert(tr("All"), QStringList() ); | 208 | map.insert(tr("All"), QStringList() ); |
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); |
217 | config.writeEntry("mp3File",str); | 217 | config.writeEntry("mp3File",str); |
218 | } | 218 | } |
219 | } else { | 219 | } else { |