-rw-r--r-- | korganizer/kotodoeditor.cpp | 43 |
1 files changed, 24 insertions, 19 deletions
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 20a35d2..aeab92a 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp | |||
@@ -24,13 +24,18 @@ | |||
24 | 24 | ||
25 | #include <qtooltip.h> | 25 | #include <qtooltip.h> |
26 | #include <qframe.h> | 26 | #include <q3frame.h> |
27 | #include <qpixmap.h> | 27 | #include <qpixmap.h> |
28 | #include <qlayout.h> | 28 | #include <qlayout.h> |
29 | #include <qhbox.h> | 29 | #include <q3hbox.h> |
30 | #include <qtimer.h> | 30 | #include <qtimer.h> |
31 | #include <qdir.h> | 31 | #include <qdir.h> |
32 | #include <qdatetime.h> | 32 | #include <qdatetime.h> |
33 | #include <qapplication.h> | 33 | #include <qapplication.h> |
34 | #include <QDesktopWidget> | ||
34 | #include <qtabwidget.h> | 35 | #include <qtabwidget.h> |
36 | //Added by qt3to4: | ||
37 | #include <Q3HBoxLayout> | ||
38 | #include <Q3PtrList> | ||
39 | #include <Q3VBoxLayout> | ||
35 | 40 | ||
36 | #include <kiconloader.h> | 41 | #include <kiconloader.h> |
@@ -82,6 +87,6 @@ void KOTodoEditor::init() | |||
82 | void KOTodoEditor::setupRecurrence() | 87 | void KOTodoEditor::setupRecurrence() |
83 | { | 88 | { |
84 | QFrame *topFrame = addPage( i18n("Recurrence") ); | 89 | Q3Frame *topFrame = addPage( i18n("Recurrence") ); |
85 | QBoxLayout *topLayout = new QVBoxLayout( topFrame ); | 90 | Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame ); |
86 | 91 | ||
87 | mRecurrence = new KOEditorRecurrence( topFrame ); | 92 | mRecurrence = new KOEditorRecurrence( topFrame ); |
@@ -112,7 +117,7 @@ void KOTodoEditor::setupGeneral() | |||
112 | 117 | ||
113 | if (KOPrefs::instance()->mCompactDialogs) { | 118 | if (KOPrefs::instance()->mCompactDialogs) { |
114 | QFrame *topFrame = addPage(i18n("General")); | 119 | Q3Frame *topFrame = addPage(i18n("General")); |
115 | 120 | ||
116 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 121 | Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame); |
117 | if ( QApplication::desktop()->width() < 480 ) { | 122 | if ( QApplication::desktop()->width() < 480 ) { |
118 | topLayout->setMargin(marginHintSmall()); | 123 | topLayout->setMargin(marginHintSmall()); |
@@ -132,15 +137,15 @@ void KOTodoEditor::setupGeneral() | |||
132 | 137 | ||
133 | 138 | ||
134 | QBoxLayout *priorityLayout; | 139 | Q3BoxLayout *priorityLayout; |
135 | if ( QApplication::desktop()->width() < 500 ) | 140 | if ( QApplication::desktop()->width() < 500 ) |
136 | priorityLayout = new QVBoxLayout( topLayout ); | 141 | priorityLayout = new Q3VBoxLayout( topLayout ); |
137 | else | 142 | else |
138 | priorityLayout = new QHBoxLayout( topLayout ); | 143 | priorityLayout = new Q3HBoxLayout( topLayout ); |
139 | QWidget* prioWidget = new QWidget (topFrame); | 144 | QWidget* prioWidget = new QWidget (topFrame); |
140 | priorityLayout->addWidget( prioWidget ); | 145 | priorityLayout->addWidget( prioWidget ); |
141 | QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget); | 146 | Q3HBoxLayout* priorityLayout2 = new Q3HBoxLayout( prioWidget); |
142 | 147 | ||
143 | 148 | ||
144 | QIconSet icon; | 149 | QIcon icon; |
145 | if ( QApplication::desktop()->width() < 321 ) | 150 | if ( QApplication::desktop()->width() < 321 ) |
146 | icon = SmallIcon("fileimport16"); | 151 | icon = SmallIcon("fileimport16"); |
@@ -165,11 +170,11 @@ void KOTodoEditor::setupGeneral() | |||
165 | topLayout->addStretch(1); | 170 | topLayout->addStretch(1); |
166 | 171 | ||
167 | QFrame *topFrame2 = addPage(i18n("Details")); | 172 | Q3Frame *topFrame2 = addPage(i18n("Details")); |
168 | 173 | ||
169 | QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2); | 174 | Q3BoxLayout *topLayout2 = new Q3VBoxLayout(topFrame2); |
170 | topLayout2->setMargin(marginHint()); | 175 | topLayout2->setMargin(marginHint()); |
171 | topLayout2->setSpacing(spacingHint()); | 176 | topLayout2->setSpacing(spacingHint()); |
172 | 177 | ||
173 | QHBoxLayout *completionLayout = new QHBoxLayout( topLayout2 ); | 178 | Q3HBoxLayout *completionLayout = new Q3HBoxLayout( topLayout2 ); |
174 | mGeneral->initCompletion(topFrame2,completionLayout); | 179 | mGeneral->initCompletion(topFrame2,completionLayout); |
175 | 180 | ||
@@ -186,7 +191,7 @@ void KOTodoEditor::setupGeneral() | |||
186 | 191 | ||
187 | } else { | 192 | } else { |
188 | QFrame *topFrame = addPage(i18n("General")); | 193 | Q3Frame *topFrame = addPage(i18n("General")); |
189 | 194 | ||
190 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 195 | Q3BoxLayout *topLayout = new Q3VBoxLayout(topFrame); |
191 | topLayout->setSpacing(spacingHint()); | 196 | topLayout->setSpacing(spacingHint()); |
192 | 197 | ||
@@ -194,8 +199,8 @@ void KOTodoEditor::setupGeneral() | |||
194 | mGeneral->initTime(topFrame,topLayout); | 199 | mGeneral->initTime(topFrame,topLayout); |
195 | mGeneral->initStatus(topFrame,topLayout); | 200 | mGeneral->initStatus(topFrame,topLayout); |
196 | QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout); | 201 | Q3BoxLayout *alarmLineLayout = new Q3HBoxLayout(topLayout); |
197 | mGeneral->initAlarm(topFrame,alarmLineLayout); | 202 | mGeneral->initAlarm(topFrame,alarmLineLayout); |
198 | mGeneral->initDescription(topFrame,topLayout); | 203 | mGeneral->initDescription(topFrame,topLayout); |
199 | QBoxLayout *detailsLayout = new QHBoxLayout(topLayout); | 204 | Q3BoxLayout *detailsLayout = new Q3HBoxLayout(topLayout); |
200 | mGeneral->initCategories( topFrame, detailsLayout ); | 205 | mGeneral->initCategories( topFrame, detailsLayout ); |
201 | mGeneral->initSecrecy( topFrame, detailsLayout ); | 206 | mGeneral->initSecrecy( topFrame, detailsLayout ); |
@@ -428,5 +433,5 @@ void KOTodoEditor::slotLoadTemplate() | |||
428 | return ; | 433 | return ; |
429 | } | 434 | } |
430 | QPtrList<Todo> todos = cal.todos(); | 435 | Q3PtrList<Todo> todos = cal.todos(); |
431 | Todo * todo = todos.first(); | 436 | Todo * todo = todos.first(); |
432 | if ( !todo ) { | 437 | if ( !todo ) { |