1 files changed, 107 insertions, 91 deletions

diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index ba94057..2b8fbd3 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -23,6 +23,8 @@
 
+#include <QDesktopWidget>
+
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qcursor.h>
-#include <qwhatsthis.h>
+#include <q3whatsthis.h>
 #include <qdialog.h>
@@ -33,3 +35,17 @@
 
-#include <qvbox.h>
+#include <q3vbox.h>
+//Added by qt3to4:
+#include <QWheelEvent>
+#include <QFocusEvent>
+#include <QDragLeaveEvent>
+#include <QMouseEvent>
+#include <QDragEnterEvent>
+#include <QKeyEvent>
+#include <Q3HBoxLayout>
+#include <Q3VBoxLayout>
+#include <QDropEvent>
+#include <QDragMoveEvent>
+#include <QPaintEvent>
+#include <Q3PopupMenu>
+#include <Q3PtrList>
 #include <kdebug.h>
@@ -70,3 +86,3 @@ KOStartTodoPrefs::KOStartTodoPrefs( QString sum, QWidget *parent, const char *na
     setCaption( i18n("Start todo") );
-    QVBoxLayout* lay = new QVBoxLayout( this );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( this );
     lay->setSpacing( 3 );
@@ -75,3 +91,3 @@ KOStartTodoPrefs::KOStartTodoPrefs( QString sum, QWidget *parent, const char *na
     lay->addWidget( lab ); 
-    lab->setAlignment( AlignCenter );
+    lab->setAlignment( Qt::AlignCenter );
 
@@ -100,3 +116,3 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
     setCaption( i18n("Stop todo") );
-    QVBoxLayout* lay = new QVBoxLayout( this );
+    Q3VBoxLayout* lay = new Q3VBoxLayout( this );
     lay->setSpacing( 3 );
@@ -105,3 +121,3 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
     lay->addWidget( lab ); 
-    lab->setAlignment( AlignHCenter );
+    lab->setAlignment( Qt::AlignHCenter );
     lab = new QLabel( i18n("Additional Comment:"), this );
@@ -110,6 +126,6 @@ KOStopTodoPrefs::KOStopTodoPrefs( Todo* todo, QWidget *parent, const char *name
     lay->addWidget( mComment );
-    QHBox * start = new QHBox ( this );
+    Q3HBox * start = new Q3HBox ( this );
     lay->addWidget( start ); 
     lab = new QLabel( i18n("Start:"), start );
-    QHBox * end = new QHBox ( this );
+    Q3HBox * end = new Q3HBox ( this );
     lay->addWidget( end ); 
@@ -175,6 +191,6 @@ void KOStopTodoPrefs::doNotSave()
 
-class KOTodoViewWhatsThis :public QWhatsThis
+class KOTodoViewWhatsThis :public Q3WhatsThis
 {
 public:
-  KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : QWhatsThis( wid ), _wid(wid),_view (view) { };
+  KOTodoViewWhatsThis( QWidget *wid, KOTodoView* view ) : Q3WhatsThis( wid ), _wid(wid),_view (view) { };
 
@@ -216,3 +232,3 @@ void KOTodoListView::contentsDragEnterEvent(QDragEnterEvent *e)
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
     e->ignore();
@@ -232,3 +248,3 @@ void KOTodoListView::contentsDragMoveEvent(QDragMoveEvent *e)
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
     e->ignore();
@@ -257,3 +273,3 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
   if ( !ICalDrag::canDecode( e ) && !VCalDrag::canDecode( e ) &&
-       !QTextDrag::canDecode( e ) ) {
+       !Q3TextDrag::canDecode( e ) ) {
     e->ignore();
@@ -302,3 +318,3 @@ void KOTodoListView::contentsDropEvent(QDropEvent *e)
     QString text;
-    if (QTextDrag::decode(e,text)) {
+    if (Q3TextDrag::decode(e,text)) {
       //QListViewItem *qlvi = itemAt( contentsToViewport(e->pos()) );
@@ -325,3 +341,3 @@ void KOTodoListView::wheelEvent (QWheelEvent *e)
 {
-    QListView::wheelEvent (e);
+    Q3ListView::wheelEvent (e);
 }
@@ -332,3 +348,3 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
     QPoint p(contentsToViewport(e->pos()));
-    QListViewItem *i = itemAt(p);
+    Q3ListViewItem *i = itemAt(p);
     bool rootClicked = true;
@@ -350,3 +366,3 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
     mMousePressed = false; 
-    if (! rootClicked && !( e->button() == RightButton)  ) {
+    if (! rootClicked && !( e->button() == Qt::RightButton)  ) {
         mPressPos = e->pos();
@@ -360,5 +376,5 @@ void KOTodoListView::contentsMousePressEvent(QMouseEvent* e)
     if (!( e->button() == RightButton && rootClicked) )
-        QListView::contentsMousePressEvent(e);   
+        Q3ListView::contentsMousePressEvent(e);   
 #else
-    QListView::contentsMousePressEvent(e);   
+    Q3ListView::contentsMousePressEvent(e);   
 #endif
@@ -368,3 +384,3 @@ void KOTodoListView::paintEvent(QPaintEvent* e)
     emit paintNeeded();
-    QListView::paintEvent( e);
+    Q3ListView::paintEvent( e);
 }
@@ -378,3 +394,3 @@ void KOTodoListView::contentsMouseMoveEvent(QMouseEvent* e)
     mMousePressed = false;
-    QListViewItem *item = itemAt(contentsToViewport(mPressPos));
+    Q3ListViewItem *item = itemAt(contentsToViewport(mPressPos));
     if (item) {
@@ -424,3 +440,3 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
         mFlagKeyPressed = true;
-    QListViewItem* cn;
+    Q3ListViewItem* cn;
     if ( (e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter) && mName != "todolistsmall") {
@@ -430,3 +446,3 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
             if ( ci ){
-                if ( e->state() == ShiftButton )
+                if ( e->state() == Qt::ShiftButton )
                     ci->setOn( false );
@@ -451,3 +467,3 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
         case Qt::Key_Up:
-            QListView::keyPressEvent (  e );
+            Q3ListView::keyPressEvent (  e );
             e->accept();
@@ -456,3 +472,3 @@ void KOTodoListView::keyPressEvent ( QKeyEvent * e )
         case Qt::Key_Right:
-            QListView::keyPressEvent (  e );
+            Q3ListView::keyPressEvent (  e );
             e->accept();
@@ -470,3 +486,3 @@ void KOTodoListView::contentsMouseReleaseEvent(QMouseEvent *e)
 {
-  QListView::contentsMouseReleaseEvent(e);
+  Q3ListView::contentsMouseReleaseEvent(e);
   mMousePressed = false;
@@ -480,3 +496,3 @@ void KOTodoListView::contentsMouseDoubleClickEvent(QMouseEvent *e)
 
-  QListViewItem *item = itemAt(vp);
+  Q3ListViewItem *item = itemAt(vp);
 
@@ -494,3 +510,3 @@ KOQuickTodo::KOQuickTodo(QWidget *parent) :
   setText(i18n("Click to add new Todo"));
-  setFocusPolicy ( QWidget::ClickFocus );
+  setFocusPolicy ( Qt::ClickFocus );
 }
@@ -525,3 +541,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mNavigator = 0;
-  QBoxLayout *topLayout = new QVBoxLayout(this);
+  Q3BoxLayout *topLayout = new Q3VBoxLayout(this);
   mName = QString ( name );
@@ -532,3 +548,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mQuickAdd = new KOQuickTodo(mQuickBar); 
-  QBoxLayout *quickLayout = new QHBoxLayout(mQuickBar);
+  Q3BoxLayout *quickLayout = new Q3HBoxLayout(mQuickBar);
   quickLayout->addWidget( mQuickAdd );
@@ -570,15 +586,15 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
-  flat->setFocusPolicy( NoFocus );
-  s_done->setFocusPolicy( NoFocus );
-  allopen->setFocusPolicy( NoFocus );
-  allclose->setFocusPolicy( NoFocus );
-  s_run->setFocusPolicy( NoFocus );
-  mNewSubBut->setFocusPolicy( NoFocus );
+  flat->setFocusPolicy( Qt::NoFocus );
+  s_done->setFocusPolicy( Qt::NoFocus );
+  allopen->setFocusPolicy( Qt::NoFocus );
+  allclose->setFocusPolicy( Qt::NoFocus );
+  s_run->setFocusPolicy( Qt::NoFocus );
+  mNewSubBut->setFocusPolicy( Qt::NoFocus );
   
-  QWhatsThis::add( flat, i18n("Click this button to display all todos in a <b>flat</b> hierarchy" ) );
-  QWhatsThis::add( allopen, i18n("Click this button to display all todos <b>openend</b>" ) );
-  QWhatsThis::add( allclose, i18n("Click this button to display all todos <b>closed</b>" ) );
-  QWhatsThis::add( s_run, i18n("Click this button to toggle show/hide <b>running</b> todos" ) );
-  QWhatsThis::add( mNewSubBut, i18n("Click this button to add a new subtodo to the currently selected todo" ) );
-  QWhatsThis::add( s_done, i18n("Click this button to toggle show/hide <b>completed</b> todos" ) );
+  Q3WhatsThis::add( flat, i18n("Click this button to display all todos in a <b>flat</b> hierarchy" ) );
+  Q3WhatsThis::add( allopen, i18n("Click this button to display all todos <b>openend</b>" ) );
+  Q3WhatsThis::add( allclose, i18n("Click this button to display all todos <b>closed</b>" ) );
+  Q3WhatsThis::add( s_run, i18n("Click this button to toggle show/hide <b>running</b> todos" ) );
+  Q3WhatsThis::add( mNewSubBut, i18n("Click this button to add a new subtodo to the currently selected todo" ) );
+  Q3WhatsThis::add( s_done, i18n("Click this button to toggle show/hide <b>completed</b> todos" ) );
 
@@ -603,15 +619,15 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->addColumn(i18n("Prio"));
-  mTodoListView->setColumnAlignment(1,AlignHCenter);
+  mTodoListView->setColumnAlignment(1,Qt::AlignHCenter);
   mTodoListView->addColumn(i18n("Complete"));
-  mTodoListView->setColumnAlignment(2,AlignCenter);
+  mTodoListView->setColumnAlignment(2,Qt::AlignCenter);
 
   mTodoListView->addColumn(i18n("Due Date"));
-  mTodoListView->setColumnAlignment(3,AlignLeft);
+  mTodoListView->setColumnAlignment(3,Qt::AlignLeft);
   mTodoListView->addColumn(i18n("Due Time"));
-  mTodoListView->setColumnAlignment(4,AlignHCenter);
+  mTodoListView->setColumnAlignment(4,Qt::AlignHCenter);
 
   mTodoListView->addColumn(i18n("Start Date"));
-  mTodoListView->setColumnAlignment(5,AlignLeft);
+  mTodoListView->setColumnAlignment(5,Qt::AlignLeft);
   mTodoListView->addColumn(i18n("Start Time"));
-  mTodoListView->setColumnAlignment(6,AlignHCenter);
+  mTodoListView->setColumnAlignment(6,Qt::AlignHCenter);
 
@@ -625,3 +641,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   mTodoListView->addColumn(i18n("Sort Id"));
-  mTodoListView->setColumnAlignment(4,AlignHCenter);
+  mTodoListView->setColumnAlignment(4,Qt::AlignHCenter);
 #endif
@@ -634,3 +650,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   for ( iii = 0; iii< 12 ; ++iii )
-      mTodoListView->setColumnWidthMode( iii, QListView::Manual );
+      mTodoListView->setColumnWidthMode( iii, Q3ListView::Manual );
 
@@ -639,3 +655,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
-  mPriorityPopupMenu = new QPopupMenu(this);
+  mPriorityPopupMenu = new Q3PopupMenu(this);
   for (int i = 1; i <= 5; i++) {
@@ -646,3 +662,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
-  mPercentageCompletedPopupMenu = new QPopupMenu(this);
+  mPercentageCompletedPopupMenu = new Q3PopupMenu(this);
   for (int i = 0; i <= 100; i+=20) {
@@ -654,3 +670,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
-  mCategoryPopupMenu = new QPopupMenu (this);
+  mCategoryPopupMenu = new Q3PopupMenu (this);
   mCategoryPopupMenu->setCheckable (true);
@@ -659,3 +675,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 
-  mCalPopupMenu = new QPopupMenu (this);
+  mCalPopupMenu = new Q3PopupMenu (this);
   mCalPopupMenu->setCheckable (true);
@@ -667,3 +683,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   
-  mItemPopupMenu = new QPopupMenu(this); 
+  mItemPopupMenu = new Q3PopupMenu(this); 
   mItemPopupMenu->insertItem(i18n("Show"), this,
@@ -712,3 +728,3 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 #endif
-  mPopupMenu = new QPopupMenu(this);
+  mPopupMenu = new Q3PopupMenu(this);
   mPopupMenu->insertItem(SmallIconSet("todo"), i18n("New Todo..."), this,
@@ -748,4 +764,4 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   // Double clicking conflicts with opening/closing the subtree
-  connect( mTodoListView, SIGNAL( doubleClicked( QListViewItem *) ),
-           SLOT( editItem( QListViewItem *) ) );
+  connect( mTodoListView, SIGNAL( doubleClicked( Q3ListViewItem *) ),
+           SLOT( editItem( Q3ListViewItem *) ) );
   /*
@@ -755,9 +771,9 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
   */ 
-  connect( mTodoListView, SIGNAL(  contextRequest ( QListViewItem *,
+  connect( mTodoListView, SIGNAL(  contextRequest ( Q3ListViewItem *,
                                                         const QPoint &,int ) ),
-           SLOT( popupMenu( QListViewItem *, const QPoint & ,int) ) );
-  connect( mTodoListView, SIGNAL( clicked( QListViewItem * ) ),
-           SLOT( itemClicked( QListViewItem * ) ) );
-  connect( mTodoListView, SIGNAL( double_Clicked( QListViewItem * ) ),
-           SLOT( itemDoubleClicked( QListViewItem * ) ) );
+           SLOT( popupMenu( Q3ListViewItem *, const QPoint & ,int) ) );
+  connect( mTodoListView, SIGNAL( clicked( Q3ListViewItem * ) ),
+           SLOT( itemClicked( Q3ListViewItem * ) ) );
+  connect( mTodoListView, SIGNAL( double_Clicked( Q3ListViewItem * ) ),
+           SLOT( itemDoubleClicked( Q3ListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( todoDropped( Todo *, int ) ),
@@ -766,6 +782,6 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
            SLOT( todoModified(Todo *, int) ) );
-  connect( mTodoListView, SIGNAL( expanded( QListViewItem * ) ),
-           SLOT( itemStateChanged( QListViewItem * ) ) );
-  connect( mTodoListView, SIGNAL( collapsed( QListViewItem * ) ),
-           SLOT( itemStateChanged( QListViewItem * ) ) );
+  connect( mTodoListView, SIGNAL( expanded( Q3ListViewItem * ) ),
+           SLOT( itemStateChanged( Q3ListViewItem * ) ) );
+  connect( mTodoListView, SIGNAL( collapsed( Q3ListViewItem * ) ),
+           SLOT( itemStateChanged( Q3ListViewItem * ) ) );
   connect( mTodoListView, SIGNAL( paintNeeded() ),
@@ -774,8 +790,8 @@ KOTodoView::KOTodoView(Calendar *calendar,QWidget* parent,const char* name) :
 #if 0
-  connect(mTodoListView,SIGNAL(selectionChanged(QListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
-  connect(mTodoListView,SIGNAL(clicked(QListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
-  connect(mTodoListView,SIGNAL(pressed(QListViewItem *)),
-          SLOT(selectionChanged(QListViewItem *)));
+  connect(mTodoListView,SIGNAL(selectionChanged(Q3ListViewItem *)),
+          SLOT(selectionChanged(Q3ListViewItem *)));
+  connect(mTodoListView,SIGNAL(clicked(Q3ListViewItem *)),
+          SLOT(selectionChanged(Q3ListViewItem *)));
+  connect(mTodoListView,SIGNAL(pressed(Q3ListViewItem *)),
+          SLOT(selectionChanged(Q3ListViewItem *)));
 #endif
@@ -883,3 +899,3 @@ void KOTodoView::updateView()
   //mTodoListView->header()->setMaximumHeight(fm.height());
-  QPtrList<Todo> todoList = calendar()->todos();
+  Q3PtrList<Todo> todoList = calendar()->todos();
 
@@ -1046,3 +1062,3 @@ bool KOTodoView::checkTodo( Todo * todo )
 
-void KOTodoView::restoreItemState( QListViewItem *item )
+void KOTodoView::restoreItemState( Q3ListViewItem *item )
 {
@@ -1098,5 +1114,5 @@ void KOTodoView::updateConfig()
 
-QPtrList<Incidence> KOTodoView::selectedIncidences()
+Q3PtrList<Incidence> KOTodoView::selectedIncidences()
 {
-  QPtrList<Incidence> selected;
+  Q3PtrList<Incidence> selected;
 
@@ -1109,5 +1125,5 @@ QPtrList<Incidence> KOTodoView::selectedIncidences()
 
-QPtrList<Todo> KOTodoView::selectedTodos()
+Q3PtrList<Todo> KOTodoView::selectedTodos()
 {
-  QPtrList<Todo> selected;
+  Q3PtrList<Todo> selected;
 
@@ -1129,3 +1145,3 @@ void KOTodoView::showDates(const QDate &, const QDate &)
 
-void KOTodoView::showEvents(QPtrList<Event>)
+void KOTodoView::showEvents(Q3PtrList<Event>)
 {
@@ -1142,3 +1158,3 @@ void KOTodoView::printPreview(CalPrinter *calPrinter, const QDate &fd,
 
-void KOTodoView::editItem(QListViewItem *item )
+void KOTodoView::editItem(Q3ListViewItem *item )
 {
@@ -1148,3 +1164,3 @@ void KOTodoView::editItem(QListViewItem *item )
 
-void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
+void KOTodoView::showItem(Q3ListViewItem *item,const QPoint &,int)
 {
@@ -1154,3 +1170,3 @@ void KOTodoView::showItem(QListViewItem *item,const QPoint &,int)
 
-void KOTodoView::popupMenu(QListViewItem *item,const QPoint &p,int column)
+void KOTodoView::popupMenu(Q3ListViewItem *item,const QPoint &p,int column)
 {
@@ -1363,3 +1379,3 @@ void KOTodoView::toggleRunningItemQuick()
 }
-void KOTodoView::itemDoubleClicked(QListViewItem *item)
+void KOTodoView::itemDoubleClicked(Q3ListViewItem *item)
 {
@@ -1430,3 +1446,3 @@ void KOTodoView::toggleRunningItem()
 
-void KOTodoView::itemClicked(QListViewItem *item)
+void KOTodoView::itemClicked(Q3ListViewItem *item)
 {
@@ -1443,3 +1459,3 @@ void KOTodoView::itemClicked(QListViewItem *item)
       bool allowReparent = true;
-      QListViewItem *par = item;
+      Q3ListViewItem *par = item;
       while ( par ) {
@@ -1471,3 +1487,3 @@ void KOTodoView::setDocumentId( const QString &id )
 
-void KOTodoView::itemStateChanged( QListViewItem *item )
+void KOTodoView::itemStateChanged( Q3ListViewItem *item )
 {
@@ -1544,3 +1560,3 @@ void  KOTodoView::setAllClose()
 }
-void  KOTodoView::setOpen( QListViewItem* item, bool setOpenI)
+void  KOTodoView::setOpen( Q3ListViewItem* item, bool setOpenI)
 {
@@ -1565,3 +1581,3 @@ void KOTodoView::displayAllFlat()
     isFlatDisplay = true;
-    QPtrList<Todo> todoList = calendar()->todos();
+    Q3PtrList<Todo> todoList = calendar()->todos();
     Todo *todo;