1 files changed, 26 insertions, 22 deletions

diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index ee9c9f6..8335ba9 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -29,6 +29,10 @@
 #include <qdialog.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qtextcodec.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qdir.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3PtrList>
 
@@ -49,4 +53,4 @@
 
-KOFilterView::KOFilterView(QPtrList<CalFilter> *filterList,QWidget* parent,
-                           const char* name,WFlags fl )
+KOFilterView::KOFilterView(Q3PtrList<CalFilter> *filterList,QWidget* parent,
+                           const char* name,Qt::WFlags fl )
   : KOFilterView_base(parent,name,fl)
@@ -116,3 +120,3 @@ KOCalEditView::KOCalEditView(QWidget* parent,
                            const char* name )
-  : QScrollView(parent,name)
+  : Q3ScrollView(parent,name)
 {
@@ -120,6 +124,6 @@ KOCalEditView::KOCalEditView(QWidget* parent,
     setResizePolicy( AutoOneFit );
-    setFrameStyle ( QFrame::Panel | QFrame::Plain );
+    setFrameStyle ( Q3Frame::Panel | Q3Frame::Plain );
     setLineWidth ( 1 ); 
     setMidLineWidth ( 1 ); 
-    setFocusPolicy(NoFocus); 
+    setFocusPolicy(Qt::NoFocus); 
 }
@@ -249,3 +253,3 @@ void KOCalEditView::readConfig()
     int ii = 0;
-    mainLayout = new QGridLayout ( mw , 2, 8 );
+    mainLayout = new Q3GridLayout ( mw , 2, 8 );
     mainLayout->setMargin( 2 );
@@ -253,3 +257,3 @@ void KOCalEditView::readConfig()
     QPushButton * addButT = new QPushButton ( mw );
-    addButT->setFocusPolicy(NoFocus); 
+    addButT->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addButT,0,0 );
@@ -257,9 +261,9 @@ void KOCalEditView::readConfig()
     connect(addButT,SIGNAL(clicked()),SLOT(defaultInfo()));
-    QWhatsThis::add( addButT, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
+    Q3WhatsThis::add( addButT, i18n("Please choose the <b>default calendar</b> in this column. Newly created or imported items are added to the default calendar.") );
     //addBut->setPixmap ( SmallIcon("greenhook16"));
     QPushButton *addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("eye"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>set a calendar to be visible</b>. If a calendar is not visible its entries are not displayed in the views. You can add items to it and it is loaded/saved as usual.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>set a calendar to be visible</b>. If a calendar is not visible its entries are not displayed in the views. You can add items to it and it is loaded/saved as usual.") );
     connect(addBut,SIGNAL(clicked()),SLOT(enableAll()));
@@ -270,3 +274,3 @@ void KOCalEditView::readConfig()
     mainLayout->addWidget( lab,0,++ii ); 
-    QWhatsThis::add( lab, i18n("In this column you can see the <b>name of the calendar</b>. If you click on the name button you will get an information box about the loaded calendar file. If the file was not loaded at startup you can try to load it here again.") );
+    Q3WhatsThis::add( lab, i18n("In this column you can see the <b>name of the calendar</b>. If you click on the name button you will get an information box about the loaded calendar file. If the file was not loaded at startup you can try to load it here again.") );
     //lab = new QLabel ( i18n(" "), mw );
@@ -275,6 +279,6 @@ void KOCalEditView::readConfig()
     addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("bell"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>disable the alarms of a calendar all together</b>. The alarm data in the calendar itself is not changed, the alarms are marked internally as \"do not use\". Useful if you load a calendar of another person but do not want to get notified about alarms of that person.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>disable the alarms of a calendar all together</b>. The alarm data in the calendar itself is not changed, the alarms are marked internally as \"do not use\". Useful if you load a calendar of another person but do not want to get notified about alarms of that person.") );
     connect(addBut,SIGNAL(clicked()),SLOT(enableAlarm()));
@@ -283,6 +287,6 @@ void KOCalEditView::readConfig()
     addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
     addBut->setPixmap ( SmallIcon("pencil"));
-    QWhatsThis::add( addBut, i18n("In this column you can <b>set a calendar and all entries of the calendar to read only</b>. If a calendar is readonly the entries cannot be edited and no items can be added to the calendar. If you change a setting of a calendar to readonly in this column all data will be saved because the data of a readonly calendar is not saved later.") );
+    Q3WhatsThis::add( addBut, i18n("In this column you can <b>set a calendar and all entries of the calendar to read only</b>. If a calendar is readonly the entries cannot be edited and no items can be added to the calendar. If you change a setting of a calendar to readonly in this column all data will be saved because the data of a readonly calendar is not saved later.") );
     connect(addBut,SIGNAL(clicked()),SLOT(disableRO()));
@@ -293,3 +297,3 @@ void KOCalEditView::readConfig()
     addBut = new QPushButton ( mw );
-    addBut->setFocusPolicy(NoFocus); 
+    addBut->setFocusPolicy(Qt::NoFocus); 
     mainLayout->addWidget( addBut,0,++ii );
@@ -297,3 +301,3 @@ void KOCalEditView::readConfig()
     connect(addBut,SIGNAL(clicked()),SLOT(addCal()));
-    QWhatsThis::add( addBut, i18n("Click this button to <b>add a calendar</b>. You can add an existing calendar file or you can add a new calendar and KO/Pi creates a new empty calendar file for you.") );
+    Q3WhatsThis::add( addBut, i18n("Click this button to <b>add a calendar</b>. You can add an existing calendar file or you can add a new calendar and KO/Pi creates a new empty calendar file for you.") );
     lab = new QLabel ( " ", mw );
@@ -433,3 +437,3 @@ int KOCalEditView::addCalendar( QString name, QString file, bool ask )
         QFile fileIn( absFile );
-        if (!fileIn.open( IO_WriteOnly ) ) {
+        if (!fileIn.open( QIODevice::WriteOnly ) ) {
             KMessageBox::sorry( this,  i18n("Sorry, cannot create the file\n%1!\nNo calendar added!").arg( file ) ); 
@@ -437,3 +441,3 @@ int KOCalEditView::addCalendar( QString name, QString file, bool ask )
         } 
-        QTextStream tsIn( &fileIn );
+        Q3TextStream tsIn( &fileIn );
         tsIn.setCodec( QTextCodec::codecForName("utf8") );
@@ -477,3 +481,3 @@ void KOCalEditView::disableRO()
 }
-void KOCalEditView::toggleList ( QPtrList<KOCalCheckButton> list , bool enable )
+void KOCalEditView::toggleList ( Q3PtrList<KOCalCheckButton> list , bool enable )
 {