From 8b67cce78d89fdbb5c2a70f257aaef0e8162d767 Mon Sep 17 00:00:00 2001 From: drw Date: Fri, 02 Apr 2004 21:00:39 +0000 Subject: Use ODebug (another 43 down...) --- 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 @@ -29,6 +29,8 @@ #include "datebookweeklst.h" #include "dateentryimpl.h" +#include + #include #include #include @@ -37,7 +39,6 @@ #include #include #include -#include #include #include @@ -46,6 +47,7 @@ #include #include #include +#include #include #include @@ -70,7 +72,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) 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" ) ); @@ -174,7 +176,7 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) #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() ) ); @@ -900,7 +902,7 @@ 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 ); 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,6 +1,6 @@ CONFIG += qt warn_on quick-app HEADERS = datebookday.h \ - datebook.h \ + datebook.h \ dateentryimpl.h \ datebookdayheaderimpl.h \ datebooksettings.h \ @@ -11,7 +11,7 @@ HEADERS = datebookday.h \ noteentryimpl.h \ onoteedit.h \ datebookdayallday.h \ - namespace_hack.h + namespace_hack.h SOURCES = main.cpp \ datebookday.cpp \ datebook.cpp \ @@ -24,18 +24,18 @@ SOURCES = main.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 @@ -19,6 +19,9 @@ **********************************************************************/ #include "datebookweekheaderimpl.h" #include "datebookweek.h" + +#include + #include #include @@ -66,22 +69,22 @@ 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)); } 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,9 +1,10 @@ #include "namespace_hack.h" #include "datebookweeklst.h" - #include "datebook.h" +#include + #include #include #include @@ -159,7 +160,7 @@ 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("<--->"); @@ -208,7 +209,7 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList &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); 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 @@ -22,6 +22,9 @@ #include "dateentryimpl.h" #include "repeatentry.h" +#include +#include + #include #include #include @@ -30,7 +33,6 @@ #include #include -#include #include "onoteedit.h" #include @@ -429,7 +431,7 @@ Event DateEntry::event() 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; @@ -437,7 +439,7 @@ Event DateEntry::event() // 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 ); @@ -447,7 +449,7 @@ Event DateEntry::event() 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 ) ); 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 @@ -5,7 +5,7 @@ Section: opie/pim Conflicts: qpe-tkccalendar Maintainer: Holger 'Zecke' Freyther 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 -- cgit v0.9.0.2