initial public commit of qt4 portp1

1 files changed, 23 insertions, 19 deletions

diff --git a/korganizer/kotodoviewitem.cpp b/korganizer/kotodoviewitem.cpp
index 519bb16..c21816d 100644
--- a/korganizer/kotodoviewitem.cpp
+++ b/korganizer/kotodoviewitem.cpp
@@ -21,3 +21,7 @@
 #include <kdebug.h>
-#include <qapp.h>
+#include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3PointArray>
+#include <QPixmap>
 #include <kglobal.h>
@@ -29,4 +33,4 @@
 
-KOTodoViewItem::KOTodoViewItem( QListView *parent, Todo *todo, KOTodoView *kotodo)
-  : QCheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+KOTodoViewItem::KOTodoViewItem( Q3ListView *parent, Todo *todo, KOTodoView *kotodo)
+  : Q3CheckListItem( parent , "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {
@@ -36,3 +40,3 @@ KOTodoViewItem::KOTodoViewItem( QListView *parent, Todo *todo, KOTodoView *kotod
 KOTodoViewItem::KOTodoViewItem( KOTodoViewItem *parent, Todo *todo, KOTodoView *kotodo )
-  : QCheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
+  : Q3CheckListItem( parent, "", CheckBox ), mTodo( todo ), mTodoView( kotodo )
 {  
@@ -82,3 +86,3 @@ void KOTodoViewItem::paintBranches(QPainter *p,const QColorGroup & cg,int w,
 {
-  QListViewItem::paintBranches(p,cg,w,y,h);
+  Q3ListViewItem::paintBranches(p,cg,w,y,h);
 }
@@ -318,3 +322,3 @@ void KOTodoViewItem::stateChange(bool state)
   if ( state ) {
-      QListViewItem * myChild = firstChild();
+      Q3ListViewItem * myChild = firstChild();
       KOTodoViewItem *item;
@@ -327,3 +331,3 @@ void KOTodoViewItem::stateChange(bool state)
   } else {
-      QListViewItem * myChild = parent();
+      Q3ListViewItem * myChild = parent();
       if ( myChild )
@@ -385,8 +389,8 @@ bool KOTodoViewItem::isAlternate()
        bool previous = true;
-       if (QListViewItem::parent())
+       if (Q3ListViewItem::parent())
        {
-          item = static_cast<KOTodoViewItem *>(QListViewItem::parent());
+          item = static_cast<KOTodoViewItem *>(Q3ListViewItem::parent());
           if (item)
              previous = item->m_odd;
-          item = static_cast<KOTodoViewItem *>(QListViewItem::parent()->firstChild());
+          item = static_cast<KOTodoViewItem *>(Q3ListViewItem::parent()->firstChild());
        }
@@ -478,3 +482,3 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
           if ( mTodo->percentComplete() == 100 )
-              fc = darkGreen;
+              fc = Qt::darkGreen;
           p->drawRect( 2, 2, width-4, height()-4);
@@ -484,3 +488,3 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
       } else {
-          QCheckListItem::paintCell(p, _cg, column, width, alignment);
+          Q3CheckListItem::paintCell(p, _cg, column, width, alignment);
       }
@@ -496,3 +500,3 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
 
-    QListView *lv = listView();
+    Q3ListView *lv = listView();
     if ( !lv )
@@ -501,3 +505,3 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
     int r = 0;
-    QCheckListItem::Type myType = QCheckListItem::CheckBox;
+    Q3CheckListItem::Type myType = Q3CheckListItem::CheckBox;
     int BoxSize = 20;
@@ -524,3 +528,3 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
     } else {
-        ASSERT( lv ); //###
+        Q_ASSERT( lv ); //###
         //	QFontMetrics fm( lv->font() );
@@ -541,3 +545,3 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
                 if ( isOn() ) {
-                    QPointArray a( 7*2 );
+                    Q3PointArray a( 7*2 );
                     int i, xx, yy;
@@ -557,3 +561,3 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
                     }
-                    p->setPen( darkGreen );
+                    p->setPen( Qt::darkGreen );
                     p->drawLineSegments( a );
@@ -567,5 +571,5 @@ void KOTodoViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, i
     p->setPen( QPen( _cg.text() ) );
-    QListViewItem::paintCell( p, _cg, column, width - r, align );
+    Q3ListViewItem::paintCell( p, _cg, column, width - r, align );
     if ( mTodo->cancelled () ) {
-        p->setPen( black );
+        p->setPen( Qt::black );
         QRect br = p->boundingRect( 1,1,1,1,0,mTodo->summary() );