author | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
---|---|---|
committer | Michael Krelin <hacker@klever.net> | 2007-07-04 11:23:42 (UTC) |
commit | a08aff328d4393031d5ba7d622c2b05705a89d73 (patch) (unidiff) | |
tree | 8ee90d686081c52e7c69b5ce946e9b1a7d690001 /korganizer/koprefsdialog.h | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
-rw-r--r-- | korganizer/koprefsdialog.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/korganizer/koprefsdialog.h b/korganizer/koprefsdialog.h index ee7a7aa..ccc1726 100644 --- a/korganizer/koprefsdialog.h +++ b/korganizer/koprefsdialog.h | |||
@@ -18,20 +18,22 @@ | |||
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 _KOPREFSDIALOG_H | 23 | #ifndef _KOPREFSDIALOG_H |
24 | #define _KOPREFSDIALOG_H | 24 | #define _KOPREFSDIALOG_H |
25 | 25 | ||
26 | #include <qframe.h> | 26 | #include <q3frame.h> |
27 | #include <qdict.h> | 27 | #include <q3dict.h> |
28 | #include <qcolor.h> | 28 | #include <qcolor.h> |
29 | #include <qlistview.h> | 29 | #include <q3listview.h> |
30 | //Added by qt3to4: | ||
31 | #include <QLabel> | ||
30 | 32 | ||
31 | #include <kdialogbase.h> | 33 | #include <kdialogbase.h> |
32 | 34 | ||
33 | #include <libkdepim/kprefsdialog.h> | 35 | #include <libkdepim/kprefsdialog.h> |
34 | #include <libkdepim/kdateedit.h> | 36 | #include <libkdepim/kdateedit.h> |
35 | #include <kcmconfigs/kdepimconfigwidget.h> | 37 | #include <kcmconfigs/kdepimconfigwidget.h> |
36 | 38 | ||
37 | class KColorButton; | 39 | class KColorButton; |
@@ -89,17 +91,17 @@ class KOPrefsDialog : public KPrefsDialog | |||
89 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); | 91 | void setCombo(QComboBox *combo,const QString & text, const QStringList *tags = 0); |
90 | 92 | ||
91 | 93 | ||
92 | private: | 94 | private: |
93 | QColor mCatDefaultColor; | 95 | QColor mCatDefaultColor; |
94 | KPrefsDialogWidBool *mEnableGroupScheduling; | 96 | KPrefsDialogWidBool *mEnableGroupScheduling; |
95 | KPrefsDialogWidBool *mEnableProjectView; | 97 | KPrefsDialogWidBool *mEnableProjectView; |
96 | 98 | ||
97 | QFrame *mPrinterTab; | 99 | Q3Frame *mPrinterTab; |
98 | 100 | ||
99 | QLineEdit *nameEdit; | 101 | QLineEdit *nameEdit; |
100 | QLineEdit *emailEdit; | 102 | QLineEdit *emailEdit; |
101 | 103 | ||
102 | QComboBox *timeCombo; | 104 | QComboBox *timeCombo; |
103 | QComboBox *tzCombo; | 105 | QComboBox *tzCombo; |
104 | 106 | ||
105 | // widgets holding preferences data | 107 | // widgets holding preferences data |
@@ -116,17 +118,17 @@ class KOPrefsDialog : public KPrefsDialog | |||
116 | QComboBox *mTimeZoneCombo; | 118 | QComboBox *mTimeZoneCombo; |
117 | QStringList tzonenames; | 119 | QStringList tzonenames; |
118 | QSpinBox *mStartTimeSpin; | 120 | QSpinBox *mStartTimeSpin; |
119 | QSpinBox *mDefaultDurationSpin; | 121 | QSpinBox *mDefaultDurationSpin; |
120 | QComboBox *mAlarmTimeCombo; | 122 | QComboBox *mAlarmTimeCombo; |
121 | 123 | ||
122 | QComboBox *mCategoryCombo; | 124 | QComboBox *mCategoryCombo; |
123 | KColorButton *mCategoryButton; | 125 | KColorButton *mCategoryButton; |
124 | QDict<QColor> mCategoryDict; | 126 | Q3Dict<QColor> mCategoryDict; |
125 | 127 | ||
126 | QSlider *mHourSizeSlider; | 128 | QSlider *mHourSizeSlider; |
127 | 129 | ||
128 | QSpinBox *mNextXDaysSpin; | 130 | QSpinBox *mNextXDaysSpin; |
129 | QSpinBox *mWhatsNextSpin; | 131 | QSpinBox *mWhatsNextSpin; |
130 | 132 | ||
131 | QLineEdit * mRemoteIPEdit; | 133 | QLineEdit * mRemoteIPEdit; |
132 | QLineEdit * mRemoteUser; | 134 | QLineEdit * mRemoteUser; |