Diffstat (limited to 'core/pim/datebook/dateentryimpl.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/datebook/dateentryimpl.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 @@ | |||
21 | #include "namespace_hack.h" | 21 | #include "namespace_hack.h" |
22 | #include "dateentryimpl.h" | 22 | #include "dateentryimpl.h" |
23 | #include "repeatentry.h" | 23 | #include "repeatentry.h" |
24 | 24 | ||
25 | #include <opie2/odebug.h> | ||
26 | #include <opie2/otimepicker.h> | ||
27 | |||
25 | #include <qpe/qpeapplication.h> | 28 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/categoryselect.h> | 29 | #include <qpe/categoryselect.h> |
27 | #include <qpe/datebookmonth.h> | 30 | #include <qpe/datebookmonth.h> |
28 | #include <qpe/tzselect.h> | 31 | #include <qpe/tzselect.h> |
29 | 32 | ||
30 | #include <qlineedit.h> | 33 | #include <qlineedit.h> |
31 | #include <qspinbox.h> | 34 | #include <qspinbox.h> |
32 | 35 | ||
33 | #include <opie2/otimepicker.h> | ||
34 | #include "onoteedit.h" | 36 | #include "onoteedit.h" |
35 | 37 | ||
36 | #include <stdlib.h> | 38 | #include <stdlib.h> |
37 | #include <stdio.h> | 39 | #include <stdio.h> |
@@ -428,17 +430,17 @@ Event DateEntry::event() | |||
428 | QDateTime start( startDate, startTime ); | 430 | QDateTime start( startDate, startTime ); |
429 | QDateTime end( endDate, endTime ); | 431 | QDateTime end( endDate, endTime ); |
430 | time_t start_utc, end_utc; | 432 | time_t start_utc, end_utc; |
431 | 433 | ||
432 | // qDebug( "tz: %s", timezone->currentZone().latin1() ); | 434 | //Opie::Core::odebug << "tz: " << timezone->currentZone() << oendl; |
433 | 435 | ||
434 | // get real timezone | 436 | // get real timezone |
435 | QString realTZ; | 437 | QString realTZ; |
436 | realTZ = QString::fromLocal8Bit( getenv("TZ") ); | 438 | realTZ = QString::fromLocal8Bit( getenv("TZ") ); |
437 | 439 | ||
438 | // set timezone | 440 | // set timezone |
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 | ||
442 | // convert to UTC based on selected TZ (calling tzset internally) | 444 | // convert to UTC based on selected TZ (calling tzset internally) |
443 | start_utc = TimeConversion::toUTC( start ); | 445 | start_utc = TimeConversion::toUTC( start ); |
444 | end_utc = TimeConversion::toUTC( end ); | 446 | end_utc = TimeConversion::toUTC( end ); |
@@ -446,9 +448,9 @@ Event DateEntry::event() | |||
446 | // done playing around... put it all back | 448 | // done playing around... put it all back |
447 | unsetenv( "TZ" ); | 449 | unsetenv( "TZ" ); |
448 | if ( !realTZ.isNull() ) | 450 | if ( !realTZ.isNull() ) |
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 | ||
452 | // convert UTC to local time (calling tzset internally) | 454 | // convert UTC to local time (calling tzset internally) |
453 | ev.setStart( TimeConversion::fromUTC( start_utc ) ); | 455 | ev.setStart( TimeConversion::fromUTC( start_utc ) ); |
454 | ev.setEnd( TimeConversion::fromUTC( end_utc ) ); | 456 | ev.setEnd( TimeConversion::fromUTC( end_utc ) ); |