-rw-r--r-- | korganizer/calendarview.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 1d62046..e4c067e 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -122,16 +122,19 @@ | |||
122 | #endif | 122 | #endif |
123 | #ifndef _WIN32_ | 123 | #ifndef _WIN32_ |
124 | #include <stdlib.h> | 124 | #include <stdlib.h> |
125 | #include <stdio.h> | 125 | #include <stdio.h> |
126 | #include <unistd.h> | 126 | #include <unistd.h> |
127 | #else | 127 | #else |
128 | #include <qprocess.h> | 128 | #include <qprocess.h> |
129 | #endif | 129 | #endif |
130 | #ifdef DESKTOP_VERSION | ||
131 | #include <kabc/stdaddressbook.h> | ||
132 | #endif | ||
130 | using namespace KOrg; | 133 | using namespace KOrg; |
131 | using namespace KCal; | 134 | using namespace KCal; |
132 | extern int globalFlagBlockAgenda; | 135 | extern int globalFlagBlockAgenda; |
133 | extern int globalFlagBlockStartup; | 136 | extern int globalFlagBlockStartup; |
134 | 137 | ||
135 | 138 | ||
136 | 139 | ||
137 | class KOBeamPrefs : public QDialog | 140 | class KOBeamPrefs : public QDialog |
@@ -149,17 +152,19 @@ class KOBeamPrefs : public QDialog | |||
149 | format->setExclusive ( true ) ; | 152 | format->setExclusive ( true ) ; |
150 | QButtonGroup* time = new QButtonGroup(1, Horizontal, i18n("Time format"), this ); | 153 | QButtonGroup* time = new QButtonGroup(1, Horizontal, i18n("Time format"), this ); |
151 | lay->addWidget( time ); time->setExclusive ( true ) ; | 154 | lay->addWidget( time ); time->setExclusive ( true ) ; |
152 | vcal = new QRadioButton(" vCalendar ", format ); | 155 | vcal = new QRadioButton(" vCalendar ", format ); |
153 | ical = new QRadioButton(" iCalendar ", format ); | 156 | ical = new QRadioButton(" iCalendar ", format ); |
154 | vcal->setChecked( true ); | 157 | vcal->setChecked( true ); |
155 | tz = new QRadioButton(i18n(" With timezone "), time ); | 158 | tz = new QRadioButton(i18n(" With timezone "), time ); |
156 | local = new QRadioButton(i18n(" Local time "), time ); | 159 | local = new QRadioButton(i18n(" Local time "), time ); |
157 | tz->setChecked( true ); | 160 | tz->setChecked( true );#ifdef DESKTOP_VERSION |
161 | #include <kabc/stdaddressbook.h> | ||
162 | #endif | ||
158 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); | 163 | QPushButton * ok = new QPushButton( i18n("Beam via IR!"), this ); |
159 | lay->addWidget( ok ); | 164 | lay->addWidget( ok ); |
160 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); | 165 | QPushButton * cancel = new QPushButton( i18n("Cancel"), this ); |
161 | lay->addWidget( cancel ); | 166 | lay->addWidget( cancel ); |
162 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); | 167 | connect ( ok,SIGNAL(clicked() ),this , SLOT ( accept() ) ); |
163 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); | 168 | connect (cancel, SIGNAL(clicked() ), this, SLOT ( reject()) ); |
164 | resize( 200, 200 ); | 169 | resize( 200, 200 ); |
165 | } | 170 | } |
@@ -1325,17 +1330,16 @@ void CalendarView::syncExternal( int mode ) | |||
1325 | } | 1330 | } |
1326 | void CalendarView::syncSharp() | 1331 | void CalendarView::syncSharp() |
1327 | { | 1332 | { |
1328 | syncExternal( 0 ); | 1333 | syncExternal( 0 ); |
1329 | 1334 | ||
1330 | } | 1335 | } |
1331 | 1336 | ||
1332 | 1337 | ||
1333 | //#include <kabc/stdaddressbook.h> | ||
1334 | bool CalendarView::importBday() | 1338 | bool CalendarView::importBday() |
1335 | { | 1339 | { |
1336 | #ifndef KORG_NOKABC | 1340 | #ifndef KORG_NOKABC |
1337 | 1341 | ||
1338 | #ifdef DESKTOP_VERSION | 1342 | #ifdef DESKTOP_VERSION |
1339 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); | 1343 | KABC::StdAddressBook* AddressBook = KABC::StdAddressBook::self( true ); |
1340 | KABC::AddressBook::Iterator it; | 1344 | KABC::AddressBook::Iterator it; |
1341 | int count = 0; | 1345 | int count = 0; |