summaryrefslogtreecommitdiffabout
path: root/korganizer/koprefs.h
authorMichael Krelin <hacker@klever.net>2007-07-04 11:23:42 (UTC)
committer Michael Krelin <hacker@klever.net>2007-07-04 11:23:42 (UTC)
commita08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff)
tree8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/koprefs.h
parent11edc920afe4f274c0964436633aa632c8288a40 (diff)
downloadkdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz
kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2
initial public commit of qt4 portp1
Diffstat (limited to 'korganizer/koprefs.h') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koprefs.h11
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
@@ -22,15 +22,18 @@
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
32class KConfig; 35class KConfig;
33class QFont; 36class QFont;
34class QColor; 37class QColor;
35class QStringList; 38class QStringList;
36 39
@@ -344,13 +347,13 @@ class KOPrefs : public KPimPrefs
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;
@@ -359,14 +362,14 @@ class KOPrefs : public KPimPrefs
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