1 files changed, 101 insertions, 92 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 192f8c0..0ea1d50 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -24,7 +24,7 @@
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qlayout.h>
 #include <qlabel.h>
-#include <qpopupmenu.h>
-#include <qprogressbar.h>
+#include <q3popupmenu.h>
+#include <q3progressbar.h>
 #include <qfileinfo.h>
@@ -32,8 +32,17 @@
 #include <qdialog.h>
-#include <qtextstream.h>
+#include <q3textstream.h>
 #include <qdir.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qregexp.h>
 #include <qpainter.h>
-#include <qpaintdevicemetrics.h>
+#include <q3paintdevicemetrics.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QMouseEvent>
+#include <QKeyEvent>
+#include <QEvent>
+#include <Q3VBoxLayout>
+#include <Q3PtrList>
+
+#include<QDesktopWidget>
 
@@ -72,6 +81,6 @@ extern QPixmap* sgListViewJournalPix;
 
-class KOListViewWhatsThis :public QWhatsThis
+class KOListViewWhatsThis :public Q3WhatsThis
 {
 public:
-  KOListViewWhatsThis( QWidget *wid, KOListView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
+  KOListViewWhatsThis( QWidget *wid, KOListView* view ) : Q3WhatsThis( wid ), _wid(wid),_view (view) { };
 
@@ -276,14 +285,14 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 
-    mListView->setColumnAlignment(0,AlignLeft);
-    mListView->setColumnAlignment(1,AlignLeft);
-    mListView->setColumnAlignment(2,AlignHCenter);
-    mListView->setColumnAlignment(3,AlignLeft);
-    mListView->setColumnAlignment(4,AlignHCenter);
-    mListView->setColumnAlignment(5,AlignLeft);
-    mListView->setColumnAlignment(6,AlignLeft);
-    mListView->setColumnAlignment(7,AlignLeft);
-    mListView->setColumnAlignment(8,AlignLeft);
-    mListView->setColumnAlignment(9,AlignLeft);
-    mListView->setColumnAlignment(10,AlignLeft);
-    mListView->setColumnAlignment(11,AlignLeft);
+    mListView->setColumnAlignment(0,Qt::AlignLeft);
+    mListView->setColumnAlignment(1,Qt::AlignLeft);
+    mListView->setColumnAlignment(2,Qt::AlignHCenter);
+    mListView->setColumnAlignment(3,Qt::AlignLeft);
+    mListView->setColumnAlignment(4,Qt::AlignHCenter);
+    mListView->setColumnAlignment(5,Qt::AlignLeft);
+    mListView->setColumnAlignment(6,Qt::AlignLeft);
+    mListView->setColumnAlignment(7,Qt::AlignLeft);
+    mListView->setColumnAlignment(8,Qt::AlignLeft);
+    mListView->setColumnAlignment(9,Qt::AlignLeft);
+    mListView->setColumnAlignment(10,Qt::AlignLeft);
+    mListView->setColumnAlignment(11,Qt::AlignLeft);
     mKOListViewWhatsThis = new KOListViewWhatsThis(mListView->viewport(),this);
@@ -292,5 +301,5 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     for ( iii = 0; iii< 12 ; ++iii )
-        mListView->setColumnWidthMode( iii, QListView::Manual );
+        mListView->setColumnWidthMode( iii, Q3ListView::Manual );
 
-    QBoxLayout *layoutTop = new QVBoxLayout(this);
+    Q3BoxLayout *layoutTop = new Q3VBoxLayout(this);
     layoutTop->addWidget(mListView);
@@ -298,3 +307,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mPopupMenu = eventPopup();
-    QPopupMenu* selPopup = new QPopupMenu ( this );
+    Q3PopupMenu* selPopup = new Q3PopupMenu ( this );
     mPopupMenu->insertSeparator();
@@ -308,3 +317,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mPopupMenu->insertItem(i18n("Selection"), selPopup );
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Hide all selected"),this,
@@ -313,3 +322,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     selPopup->insertSeparator();
-    QPopupMenu * exportPO = new QPopupMenu ( this );
+    Q3PopupMenu * exportPO = new Q3PopupMenu ( this );
     selPopup->insertItem( i18n("Export"),  exportPO );
@@ -317,3 +326,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
     mPopupMenu->insertSeparator();
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Print complete list..."),this,
@@ -321,3 +330,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 #endif
-    mCalPopup = new QPopupMenu ( this );
+    mCalPopup = new Q3PopupMenu ( this );
     selPopup->insertItem( i18n("Set Calendar"),  mCalPopup );
@@ -329,6 +338,6 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 #if 0
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Set categories")+"...",this,
                                   SLOT(setCat()),true);
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Set alarm..."),this,
@@ -358,3 +367,3 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
 #if 0
-    mPopupMenu->addAdditionalItem(QIconSet(QPixmap()),
+    mPopupMenu->addAdditionalItem(QIcon(QPixmap()),
                                   i18n("Beam via IR"),this,
@@ -377,9 +386,9 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent,
                      this,SIGNAL(signalNewEvent()));
-    QObject::connect(mListView,SIGNAL(doubleClicked(QListViewItem *)),
-                     this,SLOT(defaultItemAction(QListViewItem *)));
-    QObject::connect(mListView,SIGNAL(rightButtonPressed( QListViewItem *,
+    QObject::connect(mListView,SIGNAL(doubleClicked(Q3ListViewItem *)),
+                     this,SLOT(defaultItemAction(Q3ListViewItem *)));
+    QObject::connect(mListView,SIGNAL(rightButtonPressed( Q3ListViewItem *,
                                                            const QPoint &, int )),
-                     this,SLOT(popupMenu(QListViewItem *,const QPoint &,int)));
-    QObject::connect(mListView,SIGNAL(currentChanged(QListViewItem *)),
-                     SLOT(processSelectionChange(QListViewItem *)));
+                     this,SLOT(popupMenu(Q3ListViewItem *,const QPoint &,int)));
+    QObject::connect(mListView,SIGNAL(currentChanged(Q3ListViewItem *)),
+                     SLOT(processSelectionChange(Q3ListViewItem *)));
     QObject::connect(mListView,SIGNAL(showIncidence(Incidence *)),
@@ -430,3 +439,3 @@ void KOListView::setCalendar( int c )
     
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
@@ -444,3 +453,3 @@ void KOListView::setCalendar( int c )
     }
-    QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
+    Q3PtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars;
     KopiCalendarFile * cal = calendars.first();
@@ -499,3 +508,3 @@ void  KOListView::setAlarm()
         return;
-    QPtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
+    Q3PtrList<Incidence> delSel = getSelectedIncidences( true, true, false, true ); // no journals, only due todos
     Incidence* inc = delSel.first();
@@ -524,3 +533,3 @@ void  KOListView::setAlarm()
         } else {
-            QPtrList<Alarm> alarms = inc->alarms();
+            Q3PtrList<Alarm> alarms = inc->alarms();
             Alarm *alarm;
@@ -554,3 +563,3 @@ void KOListView::setCategories( bool removeOld )
     delete csd;
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
     Incidence* inc = delSel.first();
@@ -574,3 +583,3 @@ void KOListView::beamSelected()
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
     if ( delSel.count() )
@@ -589,3 +598,3 @@ void KOListView::saveDescriptionToFile()
     }
-    QPtrList<Incidence> delSel = getSelectedIncidences() ;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences() ;
     int icount = delSel.count();
@@ -647,3 +656,3 @@ void KOListView::saveDescriptionToFile()
             QFile file( fn );
-            if (!file.open( IO_WriteOnly ) ) {
+            if (!file.open( QIODevice::WriteOnly ) ) {
                 topLevelWidget()->setCaption(i18n("File open error - nothing saved!") ); 
@@ -651,3 +660,3 @@ void KOListView::saveDescriptionToFile()
             }  
-            QTextStream ts( &file );
+            Q3TextStream ts( &file );
             ts << text;
@@ -669,8 +678,8 @@ void KOListView::saveToFile()
 }
-QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
+Q3PtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool includeTodos, bool includeJournals, bool onlyDueTodos )
 {
-    QPtrList<Incidence> delSel ;
+    Q3PtrList<Incidence> delSel ;
     bool addSubTodos = false;
     bool askSubTodos = true;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3ListViewItem *item  = mListView->firstChild ();
     while ( item ) {
@@ -708,3 +717,3 @@ QPtrList<Incidence> KOListView::getSelectedIncidences( bool includeEvents, bool
                     if ( addSubTodos ) {
-                        QPtrList<Incidence> tempSel ;
+                        Q3PtrList<Incidence> tempSel ;
                         inc->addRelationsToList( &tempSel );
@@ -732,3 +741,3 @@ void KOListView::writeToFile( bool iCal )
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;
     if ( !iCal ) {
@@ -805,4 +814,4 @@ void  KOListView::hideAll()
 {
-    QPtrList<QListViewItem> delSel ;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3PtrList<Q3ListViewItem> delSel ;
+    Q3ListViewItem *item  = mListView->firstChild ();
     while ( item ) {
@@ -815,3 +824,3 @@ void  KOListView::hideAll()
     while ( item ) {
-        QListViewItem * del = item;
+        Q3ListViewItem * del = item;
         item = delSel.next();
@@ -826,3 +835,3 @@ void KOListView::deleteAll()
 {
-    QPtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
+    Q3PtrList<Incidence> delSel = getSelectedIncidences(); // all inc allowed;;
     if ( delSel.count() ) {
@@ -840,3 +849,3 @@ void KOListView::deleteAll()
             QLabel lab (i18n("Close dialog to abort deletion!"), &dia ); 
-            QVBoxLayout lay( &dia );
+            Q3VBoxLayout lay( &dia );
             lay.setMargin(7); 
@@ -844,3 +853,3 @@ void KOListView::deleteAll()
             lay.addWidget( &lab);
-            QProgressBar bar( icount, &dia );
+            Q3ProgressBar bar( icount, &dia );
             lay.addWidget( &bar);
@@ -886,6 +895,6 @@ int KOListView::currentDateCount()
 
-QPtrList<Incidence> KOListView::selectedIncidences()
+Q3PtrList<Incidence> KOListView::selectedIncidences()
 {
-    QPtrList<Incidence> eventList;
-    QListViewItem *item  = mListView->firstChild ();
+    Q3PtrList<Incidence> eventList;
+    Q3ListViewItem *item  = mListView->firstChild ();
     while ( item ) {
@@ -989,3 +998,3 @@ void KOListView::showDates(const QDate &start, const QDate &end)
 
-void KOListView::addEvents(QPtrList<Event> eventList)
+void KOListView::addEvents(Q3PtrList<Event> eventList)
 {
@@ -1001,3 +1010,3 @@ void KOListView::addEvents(QPtrList<Event> eventList)
 
-void KOListView::addTodos(QPtrList<Todo> eventList)
+void KOListView::addTodos(Q3PtrList<Todo> eventList)
 {
@@ -1011,3 +1020,3 @@ void KOListView::addTodos(QPtrList<Todo> eventList)
 }
-void KOListView::addJournals(QPtrList<Journal> eventList)
+void KOListView::addJournals(Q3PtrList<Journal> eventList)
 {
@@ -1046,3 +1055,3 @@ void KOListView::addIncidence(Incidence *incidence)
 
-void KOListView::showEvents(QPtrList<Event> eventList)
+void KOListView::showEvents(Q3PtrList<Event> eventList)
 {
@@ -1097,3 +1106,3 @@ KOListViewItem *KOListView::getItemForEvent(Incidence *event)
 
-void KOListView::defaultItemAction(QListViewItem *i)
+void KOListView::defaultItemAction(Q3ListViewItem *i)
 {
@@ -1104,3 +1113,3 @@ void KOListView::defaultItemAction(QListViewItem *i)
 
-void KOListView::popupMenu(QListViewItem *item,const QPoint &,int)
+void KOListView::popupMenu(Q3ListViewItem *item,const QPoint &,int)
 {
@@ -1133,3 +1142,3 @@ void KOListView::writeSettings(KConfig *config, QString setting)
 
-void KOListView::processSelectionChange(QListViewItem *)
+void KOListView::processSelectionChange(Q3ListViewItem *)
 {
@@ -1182,4 +1191,4 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
     case Qt::Key_Down:
-        if ( e->state() == ShiftButton ) {
-            QListViewItem* cn = currentItem();
+        if ( e->state() == Qt::ShiftButton ) {
+            Q3ListViewItem* cn = currentItem();
             if ( !cn ) 
@@ -1196,6 +1205,6 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
         }
-        if ( e->state() == ControlButton ) {
+        if ( e->state() == Qt::ControlButton ) {
             int count = childCount ();
             int jump = count / 5;
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
             cn = currentItem();
@@ -1213,3 +1222,3 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
         } else
-            QListView::keyPressEvent ( e ) ;
+            Q3ListView::keyPressEvent ( e ) ;
         e->accept();
@@ -1218,4 +1227,4 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
     case Qt::Key_Up:
-        if ( e->state() == ShiftButton ) {
-            QListViewItem* cn = firstChild();
+        if ( e->state() == Qt::ShiftButton ) {
+            Q3ListViewItem* cn = firstChild();
             if ( cn ) {
@@ -1227,6 +1236,6 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
         }
-        if ( e->state() == ControlButton ) {
+        if ( e->state() == Qt::ControlButton ) {
             int count = childCount ();
             int jump = count / 5;
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
             cn = currentItem();
@@ -1243,3 +1252,3 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
         } else
-            QListView::keyPressEvent ( e ) ;
+            Q3ListView::keyPressEvent ( e ) ;
         e->accept();
@@ -1247,3 +1256,3 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
     case Qt::Key_I: {
-        QListViewItem* cn;
+        Q3ListViewItem* cn;
         cn = currentItem();
@@ -1267,3 +1276,3 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
         {
-            QListViewItem* cn;
+            Q3ListViewItem* cn;
             cn = currentItem();
@@ -1272,3 +1281,3 @@ void KOListViewListView::keyPressEvent ( QKeyEvent *e)
                 if ( ci ){ 
-                    if ( e->state() == ShiftButton )
+                    if ( e->state() == Qt::ShiftButton )
                         ci->setSelected( false );
@@ -1302,8 +1311,8 @@ KOListViewListView::KOListViewListView(KOListView * lv )
 #endif
-    setSelectionMode( QListView::Multi );   
+    setSelectionMode( Q3ListView::Multi );   
     setMultiSelection( true);
 }
-bool KOListViewListView::hasMultiSelection(QListViewItem* item)
+bool KOListViewListView::hasMultiSelection(Q3ListViewItem* item)
 {
-    QListViewItem *qitem  = firstChild ();
+    Q3ListViewItem *qitem  = firstChild ();
     while ( qitem ) {
@@ -1319,3 +1328,3 @@ void KOListViewListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
     QPoint vp = contentsToViewport(e->pos());
-    QListViewItem *item = itemAt(vp);
+    Q3ListViewItem *item = itemAt(vp);
     if (!item) {
@@ -1331,4 +1340,4 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
     KListView::contentsMousePressEvent( e );
-    if (  e->button() == RightButton    ) {
-        QListViewItem* ci =  currentItem();
+    if (  e->button() == Qt::RightButton    ) {
+        Q3ListViewItem* ci =  currentItem();
         clearSelection () ;
@@ -1350,3 +1359,3 @@ void KOListViewListView::popupMenu()
     mPopupTimer->stop();
-    QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, RightButton , RightButton );
+    QMouseEvent* e = new QMouseEvent( QEvent::MouseButtonPress, mEventPos ,mEventGlobalPos, Qt::RightButton , Qt::RightButton );
     QApplication::postEvent( this->viewport(), e ); 
@@ -1358,3 +1367,3 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
     mYMousePos = mapToGlobal( (e->pos())).y();
-    if (  e->button() == LeftButton ) {
+    if (  e->button() == Qt::LeftButton ) {
         mPopupTimer->start( 600 ); 
@@ -1364,4 +1373,4 @@ void KOListViewListView::contentsMousePressEvent(QMouseEvent *e)
     KListView::contentsMousePressEvent( e );
-    if (  e->button() == RightButton    ) {
-        QListViewItem* ci =  currentItem();
+    if (  e->button() == Qt::RightButton    ) {
+        Q3ListViewItem* ci =  currentItem();
         //clearSelection();
@@ -1392,3 +1401,3 @@ void KOListViewListView::contentsMouseMoveEvent(QMouseEvent *e)
 #define protected public
-#include <qheader.h>
+#include <q3header.h>
 #undef protected 
@@ -1409,3 +1418,3 @@ void  KOListViewListView::printList()
     p.setFont(font());
-    QPaintDeviceMetrics m = QPaintDeviceMetrics ( &printer );
+    Q3PaintDeviceMetrics m = Q3PaintDeviceMetrics ( &printer );
     float dx, dy;
@@ -1445,3 +1454,3 @@ void  KOListViewListView::printList()
         int align = columnAlignment( iii );
-        if ( align == AlignAuto ) align = AlignLeft;
+        if ( align == Qt::AlignLeft ) align = Qt::AlignLeft;
         p.restore();