Use ODebug (another 43 down...)

7 files changed, 31 insertions, 23 deletions

diff --git a/core/pim/datebook/config.in b/core/pim/datebook/config.in
index d1dd44f..4658f3c 100644
--- a/core/pim/datebook/config.in
+++ b/core/pim/datebook/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBOPIE2PIM
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp
index 3934411..3d1bc0c 100644
--- a/core/pim/datebook/datebook.cpp
+++ b/core/pim/datebook/datebook.cpp
@@ -31,2 +31,4 @@
 
+#include <opie2/odebug.h>
+
 #include <qpe/datebookmonth.h>
@@ -39,3 +41,2 @@
 #include <qpe/sound.h>
-#include <qtoolbar.h>
 #include <qpe/tzselect.h>
@@ -48,2 +49,3 @@
 #include <qtl.h>
+#include <qtoolbar.h>
 #include <qwidgetstack.h>
@@ -72,3 +74,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
         db = new DateBookDBHack;
-        qDebug("loading db t=%d", t.elapsed() );
+        Opie::Core::odebug << "loading db t=" << t.elapsed() << oendl;
         loadSettings();
@@ -176,3 +178,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 
-        qDebug("done t=%d", t.elapsed() );
+        Opie::Core::odebug << "done t=" << t.elapsed() << oendl;
 
@@ -902,3 +904,3 @@ void DateBook::beamEvent( const Event &e )
 {
-    qDebug("trying to beamn");
+        Opie::Core::odebug << "trying to beam" << oendl;
     unlink( beamfile ); // delete if exists
diff --git a/core/pim/datebook/datebook.pro b/core/pim/datebook/datebook.pro
index bf9a2cc..a79c25c 100644
--- a/core/pim/datebook/datebook.pro
+++ b/core/pim/datebook/datebook.pro
@@ -2,3 +2,3 @@ CONFIG		+= qt warn_on  quick-app
         HEADERS= datebookday.h \
-                  datebook.h \
+          datebook.h \
           dateentryimpl.h \
@@ -13,3 +13,3 @@ HEADERS	= datebookday.h \
           datebookdayallday.h  \
-          namespace_hack.h 
+          namespace_hack.h
         SOURCES= main.cpp \
@@ -26,3 +26,3 @@ SOURCES	= main.cpp \
           onoteedit.cpp \
-          datebookdayallday.cpp 
+          datebookdayallday.cpp
         INTERFACES= dateentry.ui \
@@ -30,4 +30,4 @@ INTERFACES	= dateentry.ui \
                   datebookweekheader.ui \
-                          datebookweeklstheader.ui \      
-                          datebookweeklstdayhdr.ui \      
+                  datebookweeklstheader.ui \
+                  datebookweeklstdayhdr.ui \
                   repeatentrybase.ui \
@@ -37,3 +37,3 @@ INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopieui2 -lopiecore2
+LIBS            += -lqpe -lopieui2 -lopiecore2 -lopiepim2
         TARGET  = datebook
diff --git a/core/pim/datebook/datebookweekheaderimpl.cpp b/core/pim/datebook/datebookweekheaderimpl.cpp
index c237b2d..123a478 100644
--- a/core/pim/datebook/datebookweekheaderimpl.cpp
+++ b/core/pim/datebook/datebookweekheaderimpl.cpp
@@ -21,2 +21,5 @@
 #include "datebookweek.h"
+
+#include <opie2/odebug.h>
+
 #include <qpe/resource.h>
@@ -68,3 +71,3 @@ void DateBookWeekHeader::nextMonth()
 {
-        qWarning("nextMonth() " );
+        Opie::Core::owarn << "nextMonth()" << oendl;
         setDate(date.addDays(28));
@@ -73,3 +76,3 @@ void DateBookWeekHeader::prevMonth()
 {
-        qWarning("prevMonth() " );
+        Opie::Core::owarn << "prevMonth()" << oendl;
         setDate(date.addDays(-28));
@@ -78,3 +81,3 @@ void DateBookWeekHeader::nextWeek()
 {
-        qWarning("nextWeek() " );
+        Opie::Core::owarn << "nextWeek()" << oendl;
         setDate(date.addDays(7));
@@ -83,3 +86,3 @@ void DateBookWeekHeader::prevWeek()
 {
-        qWarning("prevWeek() ");
+        Opie::Core::owarn << "prevWeek()" << oendl;
         setDate(date.addDays(-7));
diff --git a/core/pim/datebook/datebookweeklst.cpp b/core/pim/datebook/datebookweeklst.cpp
index abaf3ea..de74d46 100644
--- a/core/pim/datebook/datebookweeklst.cpp
+++ b/core/pim/datebook/datebookweeklst.cpp
@@ -3,5 +3,6 @@
 
-
 #include "datebook.h"
 
+#include <opie2/odebug.h>
+
 #include <qpe/datebookmonth.h>
@@ -161,3 +162,3 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 
-        qDebug("weeklistviewconfig=%d",weeklistviewconfig);
+        Opie::Core::odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl;
                 if(weeklistviewconfig==NONE) {// No times displayed.
@@ -210,3 +211,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
         int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL);
-        qDebug("Read weeklistviewconfig: %d",weeklistviewconfig);
+        Opie::Core::odebug << "weeklistviewconfig: " << weeklistviewconfig << oendl;
 
diff --git a/core/pim/datebook/dateentryimpl.cpp b/core/pim/datebook/dateentryimpl.cpp
index 7b4716f..42bdbe2 100644
--- a/core/pim/datebook/dateentryimpl.cpp
+++ b/core/pim/datebook/dateentryimpl.cpp
@@ -24,2 +24,5 @@
 
+#include <opie2/odebug.h>
+#include <opie2/otimepicker.h>
+
 #include <qpe/qpeapplication.h>
@@ -32,3 +35,2 @@
 
-#include <opie2/otimepicker.h>
 #include "onoteedit.h"
@@ -431,3 +433,3 @@ Event DateEntry::event()
 
-//    qDebug( "tz: %s", timezone->currentZone().latin1() );
+        //Opie::Core::odebug << "tz: " << timezone->currentZone() << oendl;
 
@@ -439,3 +441,3 @@ Event DateEntry::event()
     if ( setenv( "TZ", timezone->currentZone(), true ) != 0 )
-        qWarning( "There was a problem setting the timezone." );
+        Opie::Core::owarn << "There was a problem setting the timezone." << oendl;
 
@@ -449,3 +451,3 @@ Event DateEntry::event()
         if ( setenv( "TZ", realTZ, true ) != 0 )
-            qWarning( "There was a problem setting the timezone." );
+                        Opie::Core::owarn << "There was a problem setting the timezone." << oendl;
 
diff --git a/core/pim/datebook/opie-datebook.control b/core/pim/datebook/opie-datebook.control
index 730b09d..acf28a7 100644
--- a/core/pim/datebook/opie-datebook.control
+++ b/core/pim/datebook/opie-datebook.control
@@ -7,3 +7,3 @@ Maintainer: Holger 'Zecke' Freyther <zecke@handhelds.org>
 Architecture: arm
-Depends: task-opie-minimal, libopiecore2, libopieui2,libopiepim2, opie-pics
+Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2, opie-pics
 Description: A datebook/appointment manager