initial public commit of qt4 portp1

1 files changed, 51 insertions, 43 deletions

diff --git a/korganizer/koeditorrecurrence.cpp b/korganizer/koeditorrecurrence.cpp
index e0380c4..e0ae3a0 100644
--- a/korganizer/koeditorrecurrence.cpp
+++ b/korganizer/koeditorrecurrence.cpp
@@ -24,10 +24,10 @@
 #include <qtooltip.h>
-#include <qfiledialog.h>
+#include <q3filedialog.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 <qlistbox.h>
+#include <q3listbox.h>
 #include <qspinbox.h>
@@ -35,2 +35,10 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 
@@ -83,3 +91,3 @@ RecurDaily::RecurDaily( QWidget *parent, const char *name ) :
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3HBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -102,3 +110,3 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -108,3 +116,3 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
 
-  QBoxLayout *weeksLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *weeksLayout = new Q3HBoxLayout( topLayout );
 
@@ -118,4 +126,4 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
 
-  QHBox *dayBox = new QHBox( this );
-  topLayout->addWidget( dayBox, 1, AlignVCenter );
+  Q3HBox *dayBox = new Q3HBox( this );
+  topLayout->addWidget( dayBox, 1, Qt::AlignVCenter );
   // TODO: Respect start of week setting
@@ -158,3 +166,3 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -163,3 +171,3 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
 
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
 
@@ -174,7 +182,7 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
 
-  QButtonGroup *buttonGroup = new QButtonGroup( this );
-  buttonGroup->setFrameStyle( QFrame::NoFrame );
-  topLayout->addWidget( buttonGroup, 1, AlignVCenter );
+  Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this );
+  buttonGroup->setFrameStyle( Q3Frame::NoFrame );
+  topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter );
 
-  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 3, 2 );
+  Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 3, 2 );
   buttonLayout->setSpacing( KDialog::spacingHint() );
@@ -191,3 +199,3 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
 
-  mByDayCombo = new QComboBox( buttonGroup );
+  mByDayCombo = new Q3ComboBox( buttonGroup );
   mByDayCombo->setSizeLimit( 7 );
@@ -295,3 +303,3 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -300,3 +308,3 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
 
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
 
@@ -311,7 +319,7 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
 
-  QButtonGroup *buttonGroup = new QButtonGroup( this );
-  buttonGroup->setFrameStyle( QFrame::NoFrame );
-  topLayout->addWidget( buttonGroup, 1, AlignVCenter );
+  Q3ButtonGroup *buttonGroup = new Q3ButtonGroup( this );
+  buttonGroup->setFrameStyle( Q3Frame::NoFrame );
+  topLayout->addWidget( buttonGroup, 1, Qt::AlignVCenter );
 
-  QGridLayout *buttonLayout = new QGridLayout( buttonGroup, 2, 3 );
+  Q3GridLayout *buttonLayout = new Q3GridLayout( buttonGroup, 2, 3 );
 
@@ -322,3 +330,3 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
   buttonLayout->addWidget( mByDayLabel, 0, 1 ); 
-  mByMonthCombo = new QComboBox( buttonGroup );
+  mByMonthCombo = new Q3ComboBox( buttonGroup );
   mByMonthCombo->insertItem( i18n("January") );
@@ -385,5 +393,5 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 
-  QGroupBox *groupBox = new QGroupBox( 1, Horizontal, i18n("Exceptions"),
+  Q3GroupBox *groupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Exceptions"),
                                        this );
@@ -393,3 +401,3 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
 
-  QGridLayout *boxLayout = new QGridLayout( box );
+  Q3GridLayout *boxLayout = new Q3GridLayout( box );
 
@@ -405,3 +413,3 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
 
-  mExceptionList = new QListBox( box );
+  mExceptionList = new Q3ListBox( box );
   boxLayout->addMultiCellWidget( mExceptionList, 0, 3, 1, 1 );
@@ -508,5 +516,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 
-  mRangeGroupBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Range"),
+  mRangeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Range"),
                                   this );
@@ -515,3 +523,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   QWidget *rangeBox = new QWidget( mRangeGroupBox );
-  QVBoxLayout *rangeLayout = new QVBoxLayout( rangeBox );
+  Q3VBoxLayout *rangeLayout = new Q3VBoxLayout( rangeBox );
   rangeLayout->setSpacing( KDialog::spacingHint() );
@@ -522,3 +530,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
 
-  mRangeButtonGroup = new QButtonGroup;
+  mRangeButtonGroup = new Q3ButtonGroup;
 
@@ -528,3 +536,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
 
-  QBoxLayout *durationLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *durationLayout = new Q3HBoxLayout( rangeLayout );
   durationLayout->setSpacing( KDialog::spacingHint() );
@@ -541,3 +549,3 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
 
-  QBoxLayout *endDateLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *endDateLayout = new Q3HBoxLayout( rangeLayout );
   endDateLayout->setSpacing( KDialog::spacingHint() );
@@ -668,3 +676,3 @@ RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) :
 {
-    QBoxLayout *topLayout = new QVBoxLayout( this );
+    Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 
@@ -727,3 +735,3 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2,2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2,2 );
   topLayout->setSpacing( KDialog::spacingHint() );
@@ -737,3 +745,3 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
-  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"),  
+  mTimeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Time"),  
                                  this );
@@ -754,3 +762,3 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
   //mDateTimeLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum) );
-  mRuleBox = new QGroupBox( 1, Horizontal, i18n("Recurrence Rule"), this );
+  mRuleBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Recurrence Rule"), this );
   topLayout->addMultiCellWidget( mRuleBox, 2, 2, 0, 1 );
@@ -761,3 +769,3 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
-  mRuleStack = new QWidgetStack( mRuleBox );
+  mRuleStack = new Q3WidgetStack( mRuleBox );
 
@@ -898,4 +906,4 @@ void KOEditorRecurrence::readEvent(Incidence *event)
   QBitArray rDays( 7 );
-  QPtrList<Recurrence::rMonthPos> rmp;
-  QPtrList<int> rmd;
+  Q3PtrList<Recurrence::rMonthPos> rmp;
+  Q3PtrList<int> rmd;
   int day = 0;
@@ -970,3 +978,3 @@ void KOEditorRecurrence::readEvent(Incidence *event)
               //qDebug("2day = %d ",day );
-              QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
+              Q3PtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
               int month;