initial public commit of qt4 portp1

1 files changed, 30 insertions, 26 deletions

diff --git a/kaddressbook/views/kaddressbooktableview.cpp b/kaddressbook/views/kaddressbooktableview.cpp
index 272f2eb..7efaaa9 100644
--- a/kaddressbook/views/kaddressbooktableview.cpp
+++ b/kaddressbook/views/kaddressbooktableview.cpp
@@ -2,4 +2,4 @@
 
-#include <qvbox.h>
-#include <qlistbox.h>
+#include <q3vbox.h>
+#include <q3listbox.h>
 #include <qwidget.h>
@@ -9,6 +9,10 @@
 #include <qapplication.h>
-#include <qdragobject.h>
+#include <q3dragobject.h>
 #include <qevent.h>
-#include <qurl.h>
+#include <q3url.h>
 #include <qpixmap.h>
+//Added by qt3to4:
+#include <QDropEvent>
+#include <QKeyEvent>
+#include <Q3VBoxLayout>
 
@@ -34,3 +38,3 @@
 #include <qlayout.h>
-#include <qheader.h>
+#include <q3header.h>
 #include <qregexp.h>
@@ -44,3 +48,3 @@ KAddressBookTableView::KAddressBookTableView( KABC::AddressBook *ab,
 {
-  mainLayout = new QVBoxLayout( viewWidget(), 2 );
+  mainLayout = new Q3VBoxLayout( viewWidget(), 2 );
 
@@ -79,10 +83,10 @@ void KAddressBookTableView::reconstructListView()
                    this, SLOT(addresseeSelected()));
-        disconnect(mListView, SIGNAL(executed(QListViewItem*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
-        disconnect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
-                   this, SLOT(addresseeExecuted(QListViewItem*)));
+        disconnect(mListView, SIGNAL(executed(Q3ListViewItem*)),
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
+        disconnect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
+                   this, SLOT(addresseeExecuted(Q3ListViewItem*)));
         disconnect(mListView, SIGNAL(startAddresseeDrag()), this,
                    SIGNAL(startDrag()));
-        disconnect(mListView, SIGNAL(returnPressed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+        disconnect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
 
@@ -107,3 +111,3 @@ void KAddressBookTableView::reconstructListView()
       mListView->addColumn( (*it)->label() );
-      mListView->setColumnWidthMode(c++, QListView::Manual);
+      mListView->setColumnWidthMode(c++, Q3ListView::Manual);
 //US
@@ -121,11 +125,11 @@ void KAddressBookTableView::reconstructListView()
     //    qDebug("KAddressBookTableView::reconstructListView single");
-    connect(mListView, SIGNAL(executed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(executed(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
   } else {
     //    qDebug("KAddressBookTableView::reconstructListView double");
-    connect(mListView, SIGNAL(doubleClicked(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(doubleClicked(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
   }
-    connect(mListView, SIGNAL(returnPressed(QListViewItem*)),
-          this, SLOT(addresseeExecuted(QListViewItem*)));
+    connect(mListView, SIGNAL(returnPressed(Q3ListViewItem*)),
+          this, SLOT(addresseeExecuted(Q3ListViewItem*)));
     connect(mListView, SIGNAL(signalDelete()),
@@ -346,3 +350,3 @@ void KAddressBookTableView::refresh(QString uid)
     ContactListViewItem *ceItem;
-    QListViewItemIterator it( mListView );
+    Q3ListViewItemIterator it( mListView );
     while ( it.current() ) {
@@ -368,3 +372,3 @@ QStringList KAddressBookTableView::selectedUids()
     QStringList uidList;
-    QListViewItem *item;
+    Q3ListViewItem *item;
     ContactListViewItem *ceItem;
@@ -396,3 +400,3 @@ void KAddressBookTableView::setSelected(QString uid, bool selected)
 {
-    QListViewItem *item;
+    Q3ListViewItem *item;
     ContactListViewItem *ceItem;
@@ -431,3 +435,3 @@ void KAddressBookTableView::addresseeSelected()
     // selected last.
-    QListViewItem *item;
+    Q3ListViewItem *item;
     bool found =false;
@@ -455,3 +459,3 @@ void KAddressBookTableView::addresseeSelected()
 
-void KAddressBookTableView::addresseeExecuted(QListViewItem *item)
+void KAddressBookTableView::addresseeExecuted(Q3ListViewItem *item)
 {
@@ -489,4 +493,4 @@ void KAddressBookTableView::addresseeDeleted()
 
-#ifndef KAB_EMBEDDED
-#include "kaddressbooktableview.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_kaddressbooktableview.cpp"
 #endif //KAB_EMBEDDED