-rw-r--r-- | core/pim/datebook/config.in | 2 | ||||
-rw-r--r-- | core/pim/datebook/datebook.cpp | 10 | ||||
-rw-r--r-- | core/pim/datebook/datebook.pro | 12 | ||||
-rw-r--r-- | core/pim/datebook/datebookweekheaderimpl.cpp | 11 | ||||
-rw-r--r-- | core/pim/datebook/datebookweeklst.cpp | 7 | ||||
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 10 | ||||
-rw-r--r-- | core/pim/datebook/opie-datebook.control | 2 |
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 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI | 4 | 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 @@ | |||
31 | 31 | ||
32 | #include <opie2/odebug.h> | ||
33 | |||
32 | #include <qpe/datebookmonth.h> | 34 | #include <qpe/datebookmonth.h> |
@@ -39,3 +41,2 @@ | |||
39 | #include <qpe/sound.h> | 41 | #include <qpe/sound.h> |
40 | #include <qtoolbar.h> | ||
41 | #include <qpe/tzselect.h> | 42 | #include <qpe/tzselect.h> |
@@ -48,2 +49,3 @@ | |||
48 | #include <qtl.h> | 49 | #include <qtl.h> |
50 | #include <qtoolbar.h> | ||
49 | #include <qwidgetstack.h> | 51 | #include <qwidgetstack.h> |
@@ -72,3 +74,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
72 | db = new DateBookDBHack; | 74 | db = new DateBookDBHack; |
73 | qDebug("loading db t=%d", t.elapsed() ); | 75 | Opie::Core::odebug << "loading db t=" << t.elapsed() << oendl; |
74 | loadSettings(); | 76 | loadSettings(); |
@@ -176,3 +178,3 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) | |||
176 | 178 | ||
177 | qDebug("done t=%d", t.elapsed() ); | 179 | Opie::Core::odebug << "done t=" << t.elapsed() << oendl; |
178 | 180 | ||
@@ -902,3 +904,3 @@ void DateBook::beamEvent( const Event &e ) | |||
902 | { | 904 | { |
903 | qDebug("trying to beamn"); | 905 | Opie::Core::odebug << "trying to beam" << oendl; |
904 | unlink( beamfile ); // delete if exists | 906 | 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 | |||
2 | HEADERS= datebookday.h \ | 2 | HEADERS= datebookday.h \ |
3 | datebook.h \ | 3 | datebook.h \ |
4 | dateentryimpl.h \ | 4 | dateentryimpl.h \ |
@@ -13,3 +13,3 @@ HEADERS = datebookday.h \ | |||
13 | datebookdayallday.h \ | 13 | datebookdayallday.h \ |
14 | namespace_hack.h | 14 | namespace_hack.h |
15 | SOURCES= main.cpp \ | 15 | SOURCES= main.cpp \ |
@@ -26,3 +26,3 @@ SOURCES = main.cpp \ | |||
26 | onoteedit.cpp \ | 26 | onoteedit.cpp \ |
27 | datebookdayallday.cpp | 27 | datebookdayallday.cpp |
28 | INTERFACES= dateentry.ui \ | 28 | INTERFACES= dateentry.ui \ |
@@ -30,4 +30,4 @@ INTERFACES = dateentry.ui \ | |||
30 | datebookweekheader.ui \ | 30 | datebookweekheader.ui \ |
31 | datebookweeklstheader.ui \ | 31 | datebookweeklstheader.ui \ |
32 | datebookweeklstdayhdr.ui \ | 32 | datebookweeklstdayhdr.ui \ |
33 | repeatentrybase.ui \ | 33 | repeatentrybase.ui \ |
@@ -37,3 +37,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
37 | DEPENDPATH+= $(OPIEDIR)/include | 37 | DEPENDPATH+= $(OPIEDIR)/include |
38 | LIBS += -lqpe -lopieui2 -lopiecore2 | 38 | LIBS += -lqpe -lopieui2 -lopiecore2 -lopiepim2 |
39 | TARGET = datebook | 39 | 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 @@ | |||
21 | #include "datebookweek.h" | 21 | #include "datebookweek.h" |
22 | |||
23 | #include <opie2/odebug.h> | ||
24 | |||
22 | #include <qpe/resource.h> | 25 | #include <qpe/resource.h> |
@@ -68,3 +71,3 @@ void DateBookWeekHeader::nextMonth() | |||
68 | { | 71 | { |
69 | qWarning("nextMonth() " ); | 72 | Opie::Core::owarn << "nextMonth()" << oendl; |
70 | setDate(date.addDays(28)); | 73 | setDate(date.addDays(28)); |
@@ -73,3 +76,3 @@ void DateBookWeekHeader::prevMonth() | |||
73 | { | 76 | { |
74 | qWarning("prevMonth() " ); | 77 | Opie::Core::owarn << "prevMonth()" << oendl; |
75 | setDate(date.addDays(-28)); | 78 | setDate(date.addDays(-28)); |
@@ -78,3 +81,3 @@ void DateBookWeekHeader::nextWeek() | |||
78 | { | 81 | { |
79 | qWarning("nextWeek() " ); | 82 | Opie::Core::owarn << "nextWeek()" << oendl; |
80 | setDate(date.addDays(7)); | 83 | setDate(date.addDays(7)); |
@@ -83,3 +86,3 @@ void DateBookWeekHeader::prevWeek() | |||
83 | { | 86 | { |
84 | qWarning("prevWeek() "); | 87 | Opie::Core::owarn << "prevWeek()" << oendl; |
85 | setDate(date.addDays(-7)); | 88 | 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 @@ | |||
3 | 3 | ||
4 | |||
5 | #include "datebook.h" | 4 | #include "datebook.h" |
6 | 5 | ||
6 | #include <opie2/odebug.h> | ||
7 | |||
7 | #include <qpe/datebookmonth.h> | 8 | #include <qpe/datebookmonth.h> |
@@ -161,3 +162,3 @@ DateBookWeekLstEvent::DateBookWeekLstEvent(const EffectiveEvent &ev, | |||
161 | 162 | ||
162 | qDebug("weeklistviewconfig=%d",weeklistviewconfig); | 163 | Opie::Core::odebug << "weeklistviewconfig=" << weeklistviewconfig << oendl; |
163 | if(weeklistviewconfig==NONE) {// No times displayed. | 164 | if(weeklistviewconfig==NONE) {// No times displayed. |
@@ -210,3 +211,3 @@ DateBookWeekLstView::DateBookWeekLstView(QValueList<EffectiveEvent> &ev, | |||
210 | int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL); | 211 | int weeklistviewconfig=config.readNumEntry("weeklistviewconfig", NORMAL); |
211 | qDebug("Read weeklistviewconfig: %d",weeklistviewconfig); | 212 | Opie::Core::odebug << "weeklistviewconfig: " << weeklistviewconfig << oendl; |
212 | 213 | ||
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 @@ | |||
24 | 24 | ||
25 | #include <opie2/odebug.h> | ||
26 | #include <opie2/otimepicker.h> | ||
27 | |||
25 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
@@ -32,3 +35,2 @@ | |||
32 | 35 | ||
33 | #include <opie2/otimepicker.h> | ||
34 | #include "onoteedit.h" | 36 | #include "onoteedit.h" |
@@ -431,3 +433,3 @@ Event DateEntry::event() | |||
431 | 433 | ||
432 | // qDebug( "tz: %s", timezone->currentZone().latin1() ); | 434 | //Opie::Core::odebug << "tz: " << timezone->currentZone() << oendl; |
433 | 435 | ||
@@ -439,3 +441,3 @@ Event DateEntry::event() | |||
439 | if ( setenv( "TZ", timezone->currentZone(), true ) != 0 ) | 441 | if ( setenv( "TZ", timezone->currentZone(), true ) != 0 ) |
440 | qWarning( "There was a problem setting the timezone." ); | 442 | Opie::Core::owarn << "There was a problem setting the timezone." << oendl; |
441 | 443 | ||
@@ -449,3 +451,3 @@ Event DateEntry::event() | |||
449 | if ( setenv( "TZ", realTZ, true ) != 0 ) | 451 | if ( setenv( "TZ", realTZ, true ) != 0 ) |
450 | qWarning( "There was a problem setting the timezone." ); | 452 | Opie::Core::owarn << "There was a problem setting the timezone." << oendl; |
451 | 453 | ||
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> | |||
7 | Architecture: arm | 7 | Architecture: arm |
8 | Depends: task-opie-minimal, libopiecore2, libopieui2,libopiepim2, opie-pics | 8 | Depends: task-opie-minimal, libopiecore2, libopieui2, libopiepim2, opie-pics |
9 | Description: A datebook/appointment manager | 9 | Description: A datebook/appointment manager |