-rw-r--r-- | korganizer/koprefs.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index 94bdd33..35c6110 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h | |||
@@ -16,27 +16,30 @@ | |||
16 | along with this program; if not, write to the Free Software | 16 | along with this program; if not, write to the Free Software |
17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 17 | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
18 | 18 | ||
19 | As a special exception, permission is given to link this program | 19 | As a special exception, permission is given to link this program |
20 | with any edition of Qt, and distribute the resulting executable, | 20 | with any edition of Qt, and distribute the resulting executable, |
21 | without including the source code for Qt in the source distribution. | 21 | without including the source code for Qt in the source distribution. |
22 | */ | 22 | */ |
23 | #ifndef KOPREFS_H | 23 | #ifndef KOPREFS_H |
24 | #define KOPREFS_H | 24 | #define KOPREFS_H |
25 | 25 | ||
26 | 26 | ||
27 | #include <libkdepim/kpimprefs.h> | 27 | #include <libkdepim/kpimprefs.h> |
28 | #include <qdict.h> | 28 | #include <q3dict.h> |
29 | #include <qdir.h> | 29 | #include <qdir.h> |
30 | #include <qobject.h> | 30 | #include <qobject.h> |
31 | #include <QDateTime> | ||
32 | //Added by qt3to4: | ||
33 | #include <Q3PtrList> | ||
31 | 34 | ||
32 | class KConfig; | 35 | class KConfig; |
33 | class QFont; | 36 | class QFont; |
34 | class QColor; | 37 | class QColor; |
35 | class QStringList; | 38 | class QStringList; |
36 | 39 | ||
37 | #define VIEW_WN_VIEW 1 | 40 | #define VIEW_WN_VIEW 1 |
38 | #define VIEW_NX_VIEW 2 | 41 | #define VIEW_NX_VIEW 2 |
39 | #define VIEW_J_VIEW 3 | 42 | #define VIEW_J_VIEW 3 |
40 | #define VIEW_A_VIEW 4 | 43 | #define VIEW_A_VIEW 4 |
41 | #define VIEW_ML_VIEW 5 | 44 | #define VIEW_ML_VIEW 5 |
42 | #define VIEW_M_VIEW 6 | 45 | #define VIEW_M_VIEW 6 |
@@ -338,40 +341,40 @@ class KOPrefs : public KPimPrefs | |||
338 | QString mActiveSyncPort; | 341 | QString mActiveSyncPort; |
339 | QString mActiveSyncIP; | 342 | QString mActiveSyncIP; |
340 | 343 | ||
341 | // settings for eventviewer | 344 | // settings for eventviewer |
342 | bool mEVshowDetails; | 345 | bool mEVshowDetails; |
343 | bool mEVshowCreated; | 346 | bool mEVshowCreated; |
344 | bool mEVshowChanged; | 347 | bool mEVshowChanged; |
345 | bool mWTshowDetails; | 348 | bool mWTshowDetails; |
346 | bool mWTshowCreated; | 349 | bool mWTshowCreated; |
347 | bool mWTshowChanged; | 350 | bool mWTshowChanged; |
348 | 351 | ||
349 | int mCurrentDisplayedView; | 352 | int mCurrentDisplayedView; |
350 | QPtrList<KopiCalendarFile> mCalendars; | 353 | Q3PtrList<KopiCalendarFile> mCalendars; |
351 | int mNextAvailableCalendar; | 354 | int mNextAvailableCalendar; |
352 | bool mGlobalUpdateDisabled; | 355 | bool mGlobalUpdateDisabled; |
353 | 356 | ||
354 | 357 | ||
355 | bool mDetectConflicts; | 358 | bool mDetectConflicts; |
356 | bool mIncludeFree; | 359 | bool mIncludeFree; |
357 | bool mCheckConflictsAllDayAllDay; | 360 | bool mCheckConflictsAllDayAllDay; |
358 | bool mCheckConflictsAllDayNonAD; | 361 | bool mCheckConflictsAllDayNonAD; |
359 | bool mCheckConflictsNonADAllDay; | 362 | bool mCheckConflictsNonADAllDay; |
360 | bool mCheckConflictsNonADNonAD; | 363 | bool mCheckConflictsNonADNonAD; |
361 | QString mFilterConflictEditItem; | 364 | QString mFilterConflictEditItem; |
362 | QString mFilterConflictAllItem; | 365 | QString mFilterConflictAllItem; |
363 | 366 | ||
364 | private: | 367 | private: |
365 | QDict<QColor> mCategoryColors; | 368 | Q3Dict<QColor> mCategoryColors; |
366 | QArray<KopiCalendarFile*> mDefCalColors; | 369 | QVector<KopiCalendarFile*> mDefCalColors; |
367 | QColor mDefaultCategoryColor; | 370 | QColor mDefaultCategoryColor; |
368 | 371 | ||
369 | QFont mDefaultTimeBarFont; | 372 | QFont mDefaultTimeBarFont; |
370 | QFont mDefaultViewFont; | 373 | QFont mDefaultViewFont; |
371 | QFont mDefaultMonthViewFont; | 374 | QFont mDefaultMonthViewFont; |
372 | 375 | ||
373 | QString mName; | 376 | QString mName; |
374 | QString mEmail; | 377 | QString mEmail; |
375 | }; | 378 | }; |
376 | 379 | ||
377 | #endif | 380 | #endif |