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
@@ -1,4 +1,4 @@
   config DATEBOOK
     boolean "opie-datebook (a datebook/appointment manager)"
     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
@@ -28,25 +28,27 @@
 #include "datebookweek.h"
 #include "datebookweeklst.h"
 #include "dateentryimpl.h"
 
+#include <opie2/odebug.h>
+
 #include <qpe/datebookmonth.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/finddialog.h>
 #include <qpe/ir.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/sound.h>
-#include <qtoolbar.h>
 #include <qpe/tzselect.h>
 
 #include <qaction.h>
 #include <qcopchannel_qws.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qtl.h>
+#include <qtoolbar.h>
 #include <qwidgetstack.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -69,9 +71,9 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 	bool needEvilHack= false; // if we need an Evil Hack
 	QTime t;
 	t.start();
 	db = new DateBookDBHack;
-	qDebug("loading db t=%d", t.elapsed() );
+	Opie::Core::odebug << "loading db t=" << t.elapsed() << oendl;
 	loadSettings();
 	setCaption( tr("Calendar") );
 	setIcon( Resource::loadPixmap( "datebook_icon" ) );
 
@@ -173,9 +175,9 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f )
 	connect( channel, SIGNAL(received(const QCString&,const QByteArray&)), this, SLOT(receive(const QCString&,const QByteArray&)) );
 #endif
 #endif
 
-	qDebug("done t=%d", t.elapsed() );
+	Opie::Core::odebug << "done t=" << t.elapsed() << oendl;
 
         connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
         connect( qApp, SIGNAL( reload()), this, SLOT( reload() ) );
     /*
@@ -899,9 +901,9 @@ void DateBook::setDocument( const QString &filename )
 static const char * beamfile = "/tmp/obex/event.vcs";
 
 void DateBook::beamEvent( const Event &e )
 {
-    qDebug("trying to beamn");
+	Opie::Core::odebug << "trying to beam" << oendl;
     unlink( beamfile ); // delete if exists
     mkdir("/tmp/obex/", 0755);
     Event::writeVCalendar( beamfile, e );
     Ir *ir = new Ir( this );
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
@@ -1,7 +1,7 @@
 CONFIG		+= qt warn_on  quick-app
 HEADERS	= datebookday.h \
-	  datebook.h \	
+	  datebook.h \
 	  dateentryimpl.h \
 	  datebookdayheaderimpl.h \
 	  datebooksettings.h \
 	  datebookweek.h \
@@ -10,9 +10,9 @@ HEADERS	= datebookday.h \
 	  repeatentry.h \
 	  noteentryimpl.h \
 	  onoteedit.h \
 	  datebookdayallday.h  \
-	  namespace_hack.h 
+	  namespace_hack.h
 SOURCES	= main.cpp \
 	  datebookday.cpp \
 	  datebook.cpp \
 	  dateentryimpl.cpp \
@@ -23,19 +23,19 @@ SOURCES	= main.cpp \
 	  datebookweekheaderimpl.cpp \
 	  repeatentry.cpp \
 	  noteentryimpl.cpp \
 	  onoteedit.cpp \
-	  datebookdayallday.cpp 
+	  datebookdayallday.cpp
 INTERFACES	= dateentry.ui \
 		  datebookdayheader.ui \
 		  datebookweekheader.ui \
-		  datebookweeklstheader.ui \		  
- 		  datebookweeklstdayhdr.ui \		  
+		  datebookweeklstheader.ui \
+ 		  datebookweeklstdayhdr.ui \
  		  repeatentrybase.ui \
 		  datebooksettingsbase.ui \
 		  noteentry.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH	+= $(OPIEDIR)/include
-LIBS            += -lqpe -lopieui2 -lopiecore2
+LIBS            += -lqpe -lopieui2 -lopiecore2 -lopiepim2
 TARGET		= datebook
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -18,8 +18,11 @@
 **
 **********************************************************************/
 #include "datebookweekheaderimpl.h"
 #include "datebookweek.h"
+
+#include <opie2/odebug.h>
+
 #include <qpe/resource.h>
 #include <qpe/datebookmonth.h>
 
 #include <qtoolbutton.h>
@@ -65,24 +68,24 @@ void DateBookWeekHeader::pickDate()
 }
 
 void DateBookWeekHeader::nextMonth()
 {
-	qWarning("nextMonth() " );
+	Opie::Core::owarn << "nextMonth()" << oendl;
 	setDate(date.addDays(28));
 }
 void DateBookWeekHeader::prevMonth()
 {
-	qWarning("prevMonth() " );
+	Opie::Core::owarn << "prevMonth()" << oendl;
 	setDate(date.addDays(-28));
 }
 void DateBookWeekHeader::nextWeek()
 {
-	qWarning("nextWeek() " );
+	Opie::Core::owarn << "nextWeek()" << oendl;
 	setDate(date.addDays(7));
 }
 void DateBookWeekHeader::prevWeek()
 {
-	qWarning("prevWeek() ");
+	Opie::Core::owarn << "prevWeek()" << oendl;
 	setDate(date.addDays(-7));
 }
 
 void DateBookWeekHeader::setDate( int y, int m, int d )
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
@@ -1,10 +1,11 @@
 #include "namespace_hack.h"
 #include "datebookweeklst.h"
 
-
 #include "datebook.h"
 
+#include <opie2/odebug.h>
+
 #include <qpe/datebookmonth.h>
 #include <qpe/config.h>
 #include <qpe/resource.h>
 
@@ -158,9 +159,9 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev,
 {
 	// old values... lastday = "__|__", middle="   |---", Firstday="00:00",
 	QString s,start,middle,end,day;
 
-	qDebug("weeklistviewconfig=%d",weeklistviewconfig);
+	Opie::Core::odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl;
 	if(weeklistviewconfig==NONE) {	// No times displayed.
 //		start.sprintf("%.2d:%.2d-",ev.start().hour(),ev.start().minute());
 //		middle.sprintf("<--->");
 //		end.sprintf("-%.2d:%.2d",ev.end().hour(),ev.end().minute());
@@ -207,9 +208,9 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev,
 {
 	Config config("DateBook");
 	config.setGroup("Main");
 	int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL);
-	qDebug("Read weeklistviewconfig: %d",weeklistviewconfig);
+	Opie::Core::odebug << "weeklistviewconfig: " << weeklistviewconfig << oendl;
 
 	bStartOnMonday=onM;
 	setPalette(white);
 	setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
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
@@ -21,17 +21,19 @@
 #include "namespace_hack.h"
 #include "dateentryimpl.h"
 #include "repeatentry.h"
 
+#include <opie2/odebug.h>
+#include <opie2/otimepicker.h>
+
 #include <qpe/qpeapplication.h>
 #include <qpe/categoryselect.h>
 #include <qpe/datebookmonth.h>
 #include <qpe/tzselect.h>
 
 #include <qlineedit.h>
 #include <qspinbox.h>
 
-#include <opie2/otimepicker.h>
 #include "onoteedit.h"
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -428,17 +430,17 @@ Event DateEntry::event()
     QDateTime start( startDate, startTime );
     QDateTime end( endDate, endTime );
     time_t start_utc, end_utc;
 
-//    qDebug( "tz: %s", timezone->currentZone().latin1() );
+//	Opie::Core::odebug << "tz: " << timezone->currentZone() << oendl;
 
     // get real timezone
     QString realTZ;
     realTZ = QString::fromLocal8Bit( getenv("TZ") );
 
     // set timezone
     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;
 
     // convert to UTC based on selected TZ (calling tzset internally)
     start_utc = TimeConversion::toUTC( start );
     end_utc = TimeConversion::toUTC( end );
@@ -446,9 +448,9 @@ Event DateEntry::event()
     // done playing around... put it all back
     unsetenv( "TZ" );
     if ( !realTZ.isNull() )
         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;
 
     // convert UTC to local time (calling tzset internally)
     ev.setStart( TimeConversion::fromUTC( start_utc ) );
     ev.setEnd( TimeConversion::fromUTC( end_utc ) );
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
@@ -4,8 +4,8 @@ Priority: optional
 Section: opie/pim
 Conflicts: qpe-tkccalendar
 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
  A datebook/appointment manager for the Opie environment.
 Version: $QPE_VERSION$EXTRAVERSION