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
@@ -23,15 +23,23 @@
 
 #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>
 #include <qcheckbox.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
+#include <QLabel>
+#include <Q3GridLayout>
+#include <Q3PtrList>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
 
 #include <kdialog.h>
@@ -82,5 +90,5 @@ RecurDaily::RecurDaily( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QHBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3HBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
@@ -101,5 +109,5 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
@@ -107,5 +115,5 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
   //topLayout->addStretch( 1 );
 
-  QBoxLayout *weeksLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *weeksLayout = new Q3HBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("Recur every"), this );
@@ -117,6 +125,6 @@ RecurWeekly::RecurWeekly( QWidget *parent, const char *name ) :
   weeksLayout->addWidget( postLabel );
 
-  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
   for ( int i = 0; i < 7; ++i ) {
@@ -157,10 +165,10 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
 
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("every"), this );
@@ -173,9 +181,9 @@ 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() );
   buttonLayout->setMargin( KDialog::marginHintSmall() );
@@ -190,5 +198,5 @@ RecurMonthly::RecurMonthly( QWidget *parent, const char *name ) :
   buttonLayout->addWidget( mByDayRadio, 0, 0 );
 
-  mByDayCombo = new QComboBox( buttonGroup );
+  mByDayCombo = new Q3ComboBox( buttonGroup );
   mByDayCombo->setSizeLimit( 7 );
   mByDayCombo->insertItem( i18n("1st") );
@@ -294,10 +302,10 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
   RecurBase( parent, name )
 {
-  QBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
 
 
-  QBoxLayout *freqLayout = new QHBoxLayout( topLayout );
+  Q3BoxLayout *freqLayout = new Q3HBoxLayout( topLayout );
 
   QLabel *preLabel = new QLabel( i18n("every"), this );
@@ -310,9 +318,9 @@ 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 );
 
   mByMonthRadio = new QRadioButton( i18n("On day "), buttonGroup);
@@ -321,5 +329,5 @@ RecurYearly::RecurYearly( QWidget *parent, const char *name ) :
  
   buttonLayout->addWidget( mByDayLabel, 0, 1 ); 
-  mByMonthCombo = new QComboBox( buttonGroup );
+  mByMonthCombo = new Q3ComboBox( buttonGroup );
   mByMonthCombo->insertItem( i18n("January") );
   mByMonthCombo->insertItem( i18n("February") );
@@ -384,7 +392,7 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
   QWidget( parent, 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 );
   topLayout->addWidget( groupBox );
@@ -392,5 +400,5 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
   QWidget *box = new QWidget( groupBox );
 
-  QGridLayout *boxLayout = new QGridLayout( box );
+  Q3GridLayout *boxLayout = new Q3GridLayout( box );
 
   mExceptionDateEdit = new KDateEdit( box );
@@ -404,5 +412,5 @@ ExceptionsWidget::ExceptionsWidget( QWidget *parent, const char *name ) :
   boxLayout->addWidget( deleteExceptionButton, 3, 0 );
 
-  mExceptionList = new QListBox( box );
+  mExceptionList = new Q3ListBox( box );
   boxLayout->addMultiCellWidget( mExceptionList, 0, 3, 1, 1 );
 
@@ -507,12 +515,12 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   : QWidget( parent, name )
 {
-  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 );
   topLayout->addWidget( mRangeGroupBox );
 
   QWidget *rangeBox = new QWidget( mRangeGroupBox );
-  QVBoxLayout *rangeLayout = new QVBoxLayout( rangeBox );
+  Q3VBoxLayout *rangeLayout = new Q3VBoxLayout( rangeBox );
   rangeLayout->setSpacing( KDialog::spacingHint() );
   rangeLayout->setMargin( KDialog::marginHintSmall() );
@@ -521,5 +529,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   rangeLayout->addWidget( mStartDateLabel );
 
-  mRangeButtonGroup = new QButtonGroup;
+  mRangeButtonGroup = new Q3ButtonGroup;
 
   mNoEndDateButton = new QRadioButton( i18n("No ending date"), rangeBox );
@@ -527,5 +535,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   rangeLayout->addWidget( mNoEndDateButton );
 
-  QBoxLayout *durationLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *durationLayout = new Q3HBoxLayout( rangeLayout );
   durationLayout->setSpacing( KDialog::spacingHint() );
 
@@ -540,5 +548,5 @@ RecurrenceRangeWidget::RecurrenceRangeWidget( QWidget *parent,
   durationLayout ->addWidget( endDurationLabel );
 
-  QBoxLayout *endDateLayout = new QHBoxLayout( rangeLayout );
+  Q3BoxLayout *endDateLayout = new Q3HBoxLayout( rangeLayout );
   endDateLayout->setSpacing( KDialog::spacingHint() );
 
@@ -667,5 +675,5 @@ RecurrenceChooser::RecurrenceChooser( QWidget *parent, const char *name ) :
   QWidget( parent, name )
 {
-    QBoxLayout *topLayout = new QVBoxLayout( this );
+    Q3BoxLayout *topLayout = new Q3VBoxLayout( this );
 
     mTypeCombo = new QComboBox( this );
@@ -726,5 +734,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
   QWidget( parent, name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2,2 );
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2,2 );
   topLayout->setSpacing( KDialog::spacingHint() );
   topLayout->setMargin( KDialog::marginHintSmall() );
@@ -736,5 +744,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
 
-  mTimeGroupBox = new QGroupBox( 1, Horizontal, i18n("Time"),  
+  mTimeGroupBox = new Q3GroupBox( 1, Qt::Horizontal, i18n("Time"),  
                                  this );
   topLayout->addMultiCellWidget( mTimeGroupBox, 1, 1 , 0 , 1 );
@@ -753,5 +761,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
   //mTimeGroupBox->setSizePolicy( QSizePolicy( QSizePolicy::Preferred, QSizePolicy::Maximum ) );
   //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 );
   mRecurrenceChooser = new RecurrenceChooser( mRuleBox );
@@ -760,5 +768,5 @@ KOEditorRecurrence::KOEditorRecurrence( QWidget* parent, const char *name ) :
 
 
-  mRuleStack = new QWidgetStack( mRuleBox );
+  mRuleStack = new Q3WidgetStack( mRuleBox );
 
   mDaily = new RecurDaily( mRuleStack );
@@ -897,6 +905,6 @@ void KOEditorRecurrence::readEvent(Incidence *event)
     setDefaults( event->dtStart(), dtEnd );
   QBitArray rDays( 7 );
-  QPtrList<Recurrence::rMonthPos> rmp;
-  QPtrList<int> rmd;
+  Q3PtrList<Recurrence::rMonthPos> rmp;
+  Q3PtrList<int> rmd;
   int day = 0;
   int count = 0;
@@ -969,5 +977,5 @@ void KOEditorRecurrence::readEvent(Incidence *event)
 #if 0
               //qDebug("2day = %d ",day );
-              QPtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
+              Q3PtrList<Recurrence::rMonthPos> monthlist = r->yearMonthPositions();
               int month;
               if ( !monthlist.isEmpty() ) {