initial public commit of qt4 portp1

1 files changed, 23 insertions, 20 deletions

diff --git a/libkdepim/categoryselectdialog.cpp b/libkdepim/categoryselectdialog.cpp
index 2a9b43e..4f72880 100644
--- a/libkdepim/categoryselectdialog.cpp
+++ b/libkdepim/categoryselectdialog.cpp
@@ -23,7 +23,10 @@
 
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
-#include <qheader.h>
-#include <qapp.h>
+#include <q3header.h>
+#include <qapplication.h>
 #include <qmessagebox.h>
+//Added by qt3to4:
+#include <QPixmap>
+#include <QDesktopWidget>
 #include <kmessagebox.h>
@@ -40,3 +43,3 @@ CategorySelectDialog::CategorySelectDialog( KPimPrefs *prefs, QWidget* parent,
                                             const char* name, 
-                                            bool modal, WFlags fl )
+                                            bool modal, Qt::WFlags fl )
   : CategorySelectDialog_base( parent, name, true, fl ),
@@ -83,4 +86,4 @@ void CategorySelectDialog::setCategories()
        it != mPrefs->mCustomCategories.end(); ++it ) {
-      CategorySelectItem * item = new CategorySelectItem(mCategories,*it,QCheckListItem::CheckBox);
-      QObject::connect( item, SIGNAL( stateChanged(QListViewItem *) ), this, SLOT( clicked(QListViewItem *) ) );
+      CategorySelectItem * item = new CategorySelectItem(mCategories,*it,Q3CheckListItem::CheckBox);
+      QObject::connect( item, SIGNAL( stateChanged(Q3ListViewItem *) ), this, SLOT( clicked(Q3ListViewItem *) ) );
       
@@ -102,3 +105,3 @@ void CategorySelectDialog::setSelected(const QStringList &selList)
       //qDebug(" CategorySelectDialog::setSelected(");
-    QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+    Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
     while (item) {
@@ -111,3 +114,3 @@ void CategorySelectDialog::setSelected(const QStringList &selList)
       }
-      item = (QCheckListItem *)item->nextSibling();
+      item = (Q3CheckListItem *)item->nextSibling();
     }
@@ -139,3 +142,3 @@ void CategorySelectDialog::setColorCat()
 {
-    QCheckListItem * newColorItem = (QCheckListItem * )mCategories->currentItem ();
+    Q3CheckListItem * newColorItem = (Q3CheckListItem * )mCategories->currentItem ();
    if ( !newColorItem ) {
@@ -149,3 +152,3 @@ void CategorySelectDialog::setColorCat()
 }
-void CategorySelectDialog::clicked ( QListViewItem * it )
+void CategorySelectDialog::clicked ( Q3ListViewItem * it )
 {
@@ -153,6 +156,6 @@ void CategorySelectDialog::clicked ( QListViewItem * it )
         return;
-    QCheckListItem *i = (QCheckListItem *) it;
+    Q3CheckListItem *i = (Q3CheckListItem *) it;
     if ( !i->isOn() && i==mColorItem) {
         setColorItem( 0);
-        QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+        Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
         while (item) {
@@ -162,3 +165,3 @@ void CategorySelectDialog::clicked ( QListViewItem * it )
             }
-            item = (QCheckListItem *)item->nextSibling();
+            item = (Q3CheckListItem *)item->nextSibling();
         }
@@ -168,3 +171,3 @@ void CategorySelectDialog::clicked ( QListViewItem * it )
 }
-void  CategorySelectDialog::setColorItem( QCheckListItem * newColorItem )
+void  CategorySelectDialog::setColorItem( Q3CheckListItem * newColorItem )
 {
@@ -188,3 +191,3 @@ void CategorySelectDialog::slotApply()
   QStringList categories;
-  QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+  Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
   QString colcat;
@@ -197,3 +200,3 @@ void CategorySelectDialog::slotApply()
     }
-    item = (QCheckListItem *)item->nextSibling();
+    item = (Q3CheckListItem *)item->nextSibling();
   }
@@ -222,6 +225,6 @@ void CategorySelectDialog::clear()
 {
-  QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+  Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
   while (item) {
     item->setOn(false);
-    item = (QCheckListItem *)item->nextSibling();
+    item = (Q3CheckListItem *)item->nextSibling();
   }  
@@ -232,3 +235,3 @@ void CategorySelectDialog::updateCategoryConfig()
   QStringList selected;
-  QCheckListItem *item = (QCheckListItem *)mCategories->firstChild();
+  Q3CheckListItem *item = (Q3CheckListItem *)mCategories->firstChild();
   while (item) {
@@ -237,3 +240,3 @@ void CategorySelectDialog::updateCategoryConfig()
     }
-    item = (QCheckListItem *)item->nextSibling();
+    item = (Q3CheckListItem *)item->nextSibling();
   }