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/koeditorgeneral.cpp | |
parent | 11edc920afe4f274c0964436633aa632c8288a40 (diff) | |
download | kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.zip kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.gz kdepimpi-a08aff328d4393031d5ba7d622c2b05705a89d73.tar.bz2 |
initial public commit of qt4 portp1
Diffstat (limited to 'korganizer/koeditorgeneral.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 39 |
1 files changed, 23 insertions, 16 deletions
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index 21f220c..8105432 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -25,13 +25,20 @@ | |||
25 | #include <qtooltip.h> | 25 | #include <qtooltip.h> |
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qvbox.h> | 27 | #include <q3vbox.h> |
28 | #include <qbuttongroup.h> | 28 | #include <q3buttongroup.h> |
29 | #include <qvgroupbox.h> | 29 | #include <q3vgroupbox.h> |
30 | #include <qwidgetstack.h> | 30 | #include <q3widgetstack.h> |
31 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | #include <qfile.h> | 33 | #include <qfile.h> |
34 | #include <qregexp.h> | 34 | #include <qregexp.h> |
35 | //Added by qt3to4: | ||
36 | #include <Q3HBoxLayout> | ||
37 | #include <QLabel> | ||
38 | #include <Q3GridLayout> | ||
39 | #include <Q3PtrList> | ||
40 | #include <Q3PopupMenu> | ||
35 | 41 | ||
42 | #include <QDesktopWidget> | ||
36 | 43 | ||
37 | #include <kglobal.h> | 44 | #include <kglobal.h> |
@@ -70,7 +77,7 @@ KOEditorGeneral::~KOEditorGeneral() | |||
70 | } | 77 | } |
71 | 78 | ||
72 | void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | 79 | void KOEditorGeneral::initHeader(QWidget *parent,Q3BoxLayout *topLayout) |
73 | { | 80 | { |
74 | QGridLayout *headerLayout = new QGridLayout(topLayout); | 81 | Q3GridLayout *headerLayout = new Q3GridLayout(topLayout); |
75 | 82 | ||
76 | #if 0 | 83 | #if 0 |
@@ -196,8 +203,8 @@ void KOEditorGeneral::selectedCatPopup( int index ) | |||
196 | } | 203 | } |
197 | 204 | ||
198 | void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) | 205 | void KOEditorGeneral::initCategories(QWidget *parent, Q3BoxLayout *topLayout) |
199 | { | 206 | { |
200 | QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout ); | 207 | Q3BoxLayout *categoriesLayout = new Q3HBoxLayout( topLayout ); |
201 | mCatPopup = new QPopupMenu ( parent ); | 208 | mCatPopup = new Q3PopupMenu ( parent ); |
202 | mCatPopup->setCheckable (true); | 209 | mCatPopup->setCheckable (true); |
203 | connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup())); | 210 | connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup())); |
@@ -215,7 +222,7 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) | |||
215 | } | 222 | } |
216 | 223 | ||
217 | void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout) | 224 | void KOEditorGeneral::initSecrecy(QWidget *parent, Q3BoxLayout *topLayout) |
218 | { | 225 | { |
219 | QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout ); | 226 | Q3BoxLayout *secrecyLayout = new Q3HBoxLayout( topLayout ); |
220 | 227 | ||
221 | QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent); | 228 | QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent); |
@@ -229,5 +236,5 @@ void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout) | |||
229 | } | 236 | } |
230 | 237 | ||
231 | void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout) | 238 | void KOEditorGeneral::initDescription(QWidget *parent,Q3BoxLayout *topLayout) |
232 | { | 239 | { |
233 | mDescriptionEdit = new KTextEdit(parent); | 240 | mDescriptionEdit = new KTextEdit(parent); |
@@ -244,7 +251,7 @@ void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout) | |||
244 | } | 251 | } |
245 | 252 | ||
246 | void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout) | 253 | void KOEditorGeneral::initAlarm(QWidget *parent,Q3BoxLayout *topLayout) |
247 | { | 254 | { |
248 | QBoxLayout *alarmLayout = new QHBoxLayout(topLayout); | 255 | Q3BoxLayout *alarmLayout = new Q3HBoxLayout(topLayout); |
249 | 256 | ||
250 | //mAlarmBell = new QLabel(parent); | 257 | //mAlarmBell = new QLabel(parent); |
@@ -529,5 +536,5 @@ void KOEditorGeneral::readIncidence(Incidence *event) | |||
529 | 536 | ||
530 | // set up alarm stuff | 537 | // set up alarm stuff |
531 | QPtrList<Alarm> alarms = event->alarms(); | 538 | Q3PtrList<Alarm> alarms = event->alarms(); |
532 | Alarm* alarm; | 539 | Alarm* alarm; |
533 | mAlarmIncrCombo->setCurrentItem(0); | 540 | mAlarmIncrCombo->setCurrentItem(0); |
@@ -591,5 +598,5 @@ void KOEditorGeneral::writeIncidence(Incidence *event) | |||
591 | if (event->alarms().count() == 0) | 598 | if (event->alarms().count() == 0) |
592 | event->newAlarm(); | 599 | event->newAlarm(); |
593 | QPtrList<Alarm> alarms = event->alarms(); | 600 | Q3PtrList<Alarm> alarms = event->alarms(); |
594 | Alarm *alarm; | 601 | Alarm *alarm; |
595 | for (alarm = alarms.first(); alarm; alarm = alarms.next() ) { | 602 | for (alarm = alarms.first(); alarm; alarm = alarms.next() ) { |