summaryrefslogtreecommitdiffabout
path: root/korganizer/koeditorgeneral.cpp
Side-by-side diff
Diffstat (limited to 'korganizer/koeditorgeneral.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeditorgeneral.cpp39
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
@@ -24,15 +24,22 @@
#include <qwidget.h>
#include <qtooltip.h>
#include <qlayout.h>
-#include <qvbox.h>
-#include <qbuttongroup.h>
-#include <qvgroupbox.h>
-#include <qwidgetstack.h>
+#include <q3vbox.h>
+#include <q3buttongroup.h>
+#include <q3vgroupbox.h>
+#include <q3widgetstack.h>
#include <qdatetime.h>
#include <qtimer.h>
#include <qfile.h>
#include <qregexp.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3PopupMenu>
+#include <QDesktopWidget>
#include <kglobal.h>
#include <kdialog.h>
@@ -69,9 +76,9 @@ KOEditorGeneral::~KOEditorGeneral()
{
}
-void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initHeader(QWidget *parent,Q3BoxLayout *topLayout)
{
- QGridLayout *headerLayout = new QGridLayout(topLayout);
+ Q3GridLayout *headerLayout = new Q3GridLayout(topLayout);
#if 0
mOwnerLabel = new QLabel(i18n("Owner:"),parent);
@@ -195,10 +202,10 @@ void KOEditorGeneral::selectedCatPopup( int index )
setCategories( categories.join(",") );
}
-void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneral::initCategories(QWidget *parent, Q3BoxLayout *topLayout)
{
- QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout );
- mCatPopup = new QPopupMenu ( parent );
+ Q3BoxLayout *categoriesLayout = new Q3HBoxLayout( topLayout );
+ mCatPopup = new Q3PopupMenu ( parent );
mCatPopup->setCheckable (true);
connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup()));
connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT(selectedCatPopup( int )));
@@ -214,9 +221,9 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout)
categoriesLayout->addWidget(mCategoriesLabel,1);
}
-void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
+void KOEditorGeneral::initSecrecy(QWidget *parent, Q3BoxLayout *topLayout)
{
- QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout );
+ Q3BoxLayout *secrecyLayout = new Q3HBoxLayout( topLayout );
QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent);
mCancelBox = new QCheckBox ( i18n("Cancelled"), parent);
@@ -228,7 +235,7 @@ void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout)
secrecyLayout->addWidget(mSecrecyCombo);
}
-void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initDescription(QWidget *parent,Q3BoxLayout *topLayout)
{
mDescriptionEdit = new KTextEdit(parent);
mDescriptionEdit->setFont(KOPrefs::instance()->mEditBoxFont );
@@ -243,9 +250,9 @@ void KOEditorGeneral::initDescription(QWidget *parent,QBoxLayout *topLayout)
}
-void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
+void KOEditorGeneral::initAlarm(QWidget *parent,Q3BoxLayout *topLayout)
{
- QBoxLayout *alarmLayout = new QHBoxLayout(topLayout);
+ Q3BoxLayout *alarmLayout = new Q3HBoxLayout(topLayout);
//mAlarmBell = new QLabel(parent);
//mAlarmBell->setPixmap(SmallIcon("bell"));
@@ -528,7 +535,7 @@ void KOEditorGeneral::readIncidence(Incidence *event)
mAlarmSoundButton->setOn(false);
// set up alarm stuff
- QPtrList<Alarm> alarms = event->alarms();
+ Q3PtrList<Alarm> alarms = event->alarms();
Alarm* alarm;
mAlarmIncrCombo->setCurrentItem(0);
for ( alarm = alarms.first(); alarm; alarm = alarms.next() ) {
@@ -590,7 +597,7 @@ void KOEditorGeneral::writeIncidence(Incidence *event)
if (mAlarmButton->isChecked()) {
if (event->alarms().count() == 0)
event->newAlarm();
- QPtrList<Alarm> alarms = event->alarms();
+ Q3PtrList<Alarm> alarms = event->alarms();
Alarm *alarm;
for (alarm = alarms.first(); alarm; alarm = alarms.next() ) {
alarm->setEnabled(true);