Clock: libopie -> libopie2

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 @@
 CONFIG    = qt warn_on release quick-app
 HEADERS   = clock.h setAlarm.h
 SOURCES   = clock.cpp setAlarm.cpp \
       main.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopie -lpthread
+LIBS            += -lqpe -lopiecore2 -lopieui2 -lpthread
 TARGET    = clock
 
 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 @@
   config CLOCK
     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
@@ -15,13 +15,12 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "clock.h"
 
-#include <qpe/qpeapplication.h>
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 
 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 @@
 Package: opie-clock
 Files: plugins/application/libclock.so* bin/clock apps/Applications/clock.desktop
 Priority: optional
 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.
 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
@@ -9,18 +9,18 @@
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 
 #include "setAlarm.h"
 
-#include <opie/ofileselector.h>
-#include <opie/ofiledialog.h>
+#include <opie2/ofileselector.h>
+#include <opie2/ofiledialog.h>
 
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 #include <qstring.h>
 #include <qlabel.h>
 #include <qlcdnumber.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
@@ -204,18 +204,18 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
     Config config( "qpe" );
     config.setGroup("Time");
     if(b) {
         QMap<QString, QStringList> map;
         map.insert(tr("All"), QStringList() );
         QStringList text;
         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);
             config.writeEntry("mp3Alarm",1);
             config.writeEntry("mp3File",str);
         }
     } else {
         config.writeEntry("mp3Alarm",0);
         config.writeEntry("mp3File","");