Opie DP changes

6 files changed, 8 insertions, 6 deletions

diff --git a/core/pim/datebook/config.in b/core/pim/datebook/config.in
index aa3e8fc..dd9c798 100644
--- a/core/pim/datebook/config.in
+++ b/core/pim/datebook/config.in
@@ -1,4 +1,4 @@
   config DATEBOOK
     boolean "opie-datebook (a datebook/appointment manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index f3b5a59..2b2efaa 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -25,16 +25,16 @@ SOURCES	= main.cpp \
           onoteedit.cpp \
           datebookdayallday.cpp
         INTERFACES= dateentry.ui \
                   datebookdayheader.ui \
                   datebookweekheader.ui \
                           datebookweeklstheader.ui \      
                           datebookweeklstdayhdr.ui \      
                   repeatentrybase.ui \
                   datebooksettingsbase.ui \
                   noteentry.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopie
+LIBS            += -lqpe -lopieui2
         TARGET  = datebook
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index af40143..30c925d 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -4,24 +4,25 @@
 #include "datebook.h"
 
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
 #include <qlayout.h>
 #include <qtoolbutton.h>
 #include <qtl.h>
 
 bool calcWeek(const QDate &d, int &week, int &year,bool startOnMonday = false);
 
+using namespace Opie::Ui;
 DateBookWeekLstHeader::DateBookWeekLstHeader(bool onM, QWidget* parent, const char* name, WFlags fl)
     : DateBookWeekLstHeaderBase(parent, name, fl)
 {
         setBackgroundMode( PaletteButton );
         labelDate->setBackgroundMode( PaletteButton );
         forwardweek->setBackgroundMode( PaletteButton );
         forwardweek->setPixmap( Resource::loadPixmap("forward") );
         forwardmonth->setBackgroundMode( PaletteButton );
         forwardmonth->setPixmap( Resource::loadPixmap("fastforward") );
         backweek->setBackgroundMode( PaletteButton );
         backweek->setPixmap( Resource::loadPixmap("back") );
         backmonth->setBackgroundMode( PaletteButton );
diff --git a/core/pim/datebook/datebookweeklst.h b/core/pim/datebook/datebookweeklst.h
index f683ce7..32fa23f 100644
--- a/core/pim/datebook/datebookweeklst.h
+++ b/core/pim/datebook/datebookweeklst.h
@@ -1,25 +1,25 @@
 #ifndef DATEBOOKWEEKLST
 #define DATEBOOKWEEKLST
 
 #include <qwidget.h>
 #include <qdatetime.h> 
 #include <qpe/event.h>
 #include <qlabel.h> 
 #include <qscrollview.h>
 
 #include "datebookweeklstheader.h"
 #include "datebookweeklstdayhdr.h"
 
-#include <opie/oclickablelabel.h>
+#include <opie2/oclickablelabel.h>
 
 class QDateTime;
 class DateBookDB;
 
 class DateBookWeekLstHeader: public DateBookWeekLstHeaderBase
 {
     Q_OBJECT
 public:
     DateBookWeekLstHeader(bool onM, QWidget* parent = 0, const char* name = 0, 
                           WFlags fl = 0 );
     ~DateBookWeekLstHeader();
     void setDate(const QDate &d);
@@ -49,25 +49,25 @@ public:
                           WFlags fl = 0 );
 public slots:
     void showDay();
     void newEvent(); 
 signals:
     void showDate(int y, int m, int d);
     void addEvent(const QDateTime &start, const QDateTime &stop,
                   const QString &str, const QString &location);
 private:
     QDate date;
 };
 
-class DateBookWeekLstEvent: public OClickableLabel 
+class DateBookWeekLstEvent: public Opie::Ui::OClickableLabel 
 {
   Q_OBJECT
 public:
     DateBookWeekLstEvent(const EffectiveEvent &ev, int weeklistviewconfig =1,
                          QWidget* parent = 0, const char* name = 0,
                          WFlags fl = 0);
 signals:
     void editEvent(const Event &e);
 private slots:
     void editMe();
 private:
     const EffectiveEvent event;
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 57bcd89..dbff18f 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -20,25 +20,25 @@
 
 #include "dateentryimpl.h"
 #include "repeatentry.h"
 
 #include <qpe/qpeapplication.h>
 #include <qpe/categoryselect.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/tzselect.h>
 
 #include <qlineedit.h>
 #include <qspinbox.h>
 
-#include <opie/otimepicker.h>
+#include <opie2/otimepicker.h>
 #include "onoteedit.h"
 
 #include <stdlib.h>
 #include <stdio.h>
 
 /*
  *  Constructs a DateEntry which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
diff --git a/core/pim/datebook/main.cpp b/core/pim/datebook/main.cpp
index 421e457..3cb60af 100644
--- a/core/pim/datebook/main.cpp
+++ b/core/pim/datebook/main.cpp
@@ -10,15 +10,16 @@
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #include "datebook.h"
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
          
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<DateBook> )