initial public commit of qt4 portp1

4 files changed, 41 insertions, 27 deletions

diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index bfcb121..996177b 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -23,3 +23,3 @@
 
-#include <qbuttongroup.h>
+#include <q3buttongroup.h>
 #include <qcombobox.h>
@@ -27,5 +27,12 @@
 #include <qlayout.h>
-#include <qlistview.h>
+#include <q3listview.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
+//Added by qt3to4:
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <Q3GridLayout>
+#include <Q3Frame>
+#include <Q3VBoxLayout>
+#include <QDragEnterEvent>
 
@@ -79,3 +86,3 @@ extern "C" {
 
-class ContactItem : public QListViewItem
+class ContactItem : public Q3ListViewItem
 {
@@ -84,3 +91,3 @@ class ContactItem : public QListViewItem
                const QString &email = QString::null ) :
-      QListViewItem( parent ),
+      Q3ListViewItem( parent ),
       mAddressee( addressee ),
@@ -123,3 +130,3 @@ DistributionListWidget::DistributionListWidget( KABCore *core, QWidget *parent,
 {
-  QGridLayout *topLayout = new QGridLayout( this, 3, 4, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 3, 4, KDialog::marginHint(),
                                             KDialog::spacingHint() );
@@ -168,4 +175,4 @@ DistributionListWidget::DistributionListWidget( KABCore *core, QWidget *parent,
            SLOT( selectionContactViewChanged() ) );
-  connect( mContactView, SIGNAL( dropped( QDropEvent*, QListViewItem* ) ),
-           SLOT( dropped( QDropEvent*, QListViewItem* ) ) );
+  connect( mContactView, SIGNAL( dropped( QDropEvent*, Q3ListViewItem* ) ),
+           SLOT( dropped( QDropEvent*, Q3ListViewItem* ) ) );
 
@@ -412,3 +419,3 @@ QString DistributionListWidget::identifier() const
 
-void DistributionListWidget::dropped( QDropEvent *e, QListViewItem* )
+void DistributionListWidget::dropped( QDropEvent *e, Q3ListViewItem* )
 {
@@ -434,3 +441,3 @@ void DistributionListView::dragEnterEvent( QDragEnterEvent* e )
 #ifndef KAB_EMBEDDED
-  bool canDecode = QTextDrag::canDecode( e );
+  bool canDecode = Q3TextDrag::canDecode( e );
   e->accept( canDecode );
@@ -442,3 +449,3 @@ void DistributionListView::viewportDragMoveEvent( QDragMoveEvent *e )
 #ifndef KAB_EMBEDDED
-  bool canDecode = QTextDrag::canDecode( e );
+  bool canDecode = Q3TextDrag::canDecode( e );
   e->accept( canDecode );
@@ -463,6 +470,6 @@ EmailSelector::EmailSelector( const QStringList &emails,
 {
-  QFrame *topFrame = plainPage();
-  QBoxLayout *topLayout = new QVBoxLayout( topFrame );
+  Q3Frame *topFrame = plainPage();
+  Q3BoxLayout *topLayout = new Q3VBoxLayout( topFrame );
 
-  mButtonGroup = new QButtonGroup( 1, Horizontal, i18n("Email Addresses"),
+  mButtonGroup = new Q3ButtonGroup( 1, Qt::Horizontal, i18n("Email Addresses"),
                                    topFrame );
@@ -481,3 +488,3 @@ QString EmailSelector::selected()
 {
-  QButton *button = mButtonGroup->selected();
+  QAbstractButton *button = mButtonGroup->selected();
   if ( button )
@@ -498,4 +505,4 @@ QString EmailSelector::getEmail( const QStringList &emails,
 
-#ifndef KAB_EMBEDDED
-#include "distributionlistwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_distributionlistwidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/features/distributionlistwidget.h b/kaddressbook/features/distributionlistwidget.h
index 82bac3d..f619389 100644
--- a/kaddressbook/features/distributionlistwidget.h
+++ b/kaddressbook/features/distributionlistwidget.h
@@ -30,7 +30,12 @@
 #include "extensionwidget.h"
+//Added by qt3to4:
+#include <QDragEnterEvent>
+#include <QDropEvent>
+#include <QLabel>
+#include <QDragMoveEvent>
 
-class QButtonGroup;
+class Q3ButtonGroup;
 class QComboBox;
 class QLabel;
-class QListView;
+class Q3ListView;
 
@@ -59,3 +64,3 @@ class DistributionListWidget : public ExtensionWidget
     void save();
-    void dropped( QDropEvent*, QListViewItem* );
+    void dropped( QDropEvent*, Q3ListViewItem* );
 
@@ -122,3 +127,3 @@ class EmailSelector : public KDialogBase
   private:
-    QButtonGroup *mButtonGroup;
+    Q3ButtonGroup *mButtonGroup;
 };
diff --git a/kaddressbook/features/mergewidget.cpp b/kaddressbook/features/mergewidget.cpp
index 2476e42..1becc2f 100644
--- a/kaddressbook/features/mergewidget.cpp
+++ b/kaddressbook/features/mergewidget.cpp
@@ -25,2 +25,4 @@
 #include <qpushbutton.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
 
@@ -65,3 +67,3 @@ extern "C" {
 
-class ContactItem : public QListViewItem
+class ContactItem : public Q3ListViewItem
 {
@@ -69,3 +71,3 @@ class ContactItem : public QListViewItem
     ContactItem( KListView *parent, const KABC::Addressee &addressee )
-      : QListViewItem( parent ), mAddressee( addressee )
+      : Q3ListViewItem( parent ), mAddressee( addressee )
     {
@@ -96,3 +98,3 @@ MergeWidget::MergeWidget( KABCore *core, QWidget *parent, const char *name )
   
-  QGridLayout *topLayout = new QGridLayout( this, 3, 2, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 3, 2, KDialog::marginHint(),
                                             KDialog::spacingHint() );
@@ -216,3 +218,3 @@ void MergeWidget::mergeAndRemove()
   mBlockUpdate = true;
-  core()->deleteContacts( oldUID );
+  core()->deleteContacts( QStringList(oldUID) );
   core()->setContactSelected( mMasterAddressee.uid() );
@@ -371,4 +373,4 @@ void MergeWidget::doMerge( const KABC::Addressee &addr )
 
-#ifndef KAB_EMBEDDED
-#include "mergewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_mergewidget.cpp"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/features/mergewidget.h b/kaddressbook/features/mergewidget.h
index 1063c80..bb16282 100644
--- a/kaddressbook/features/mergewidget.h
+++ b/kaddressbook/features/mergewidget.h
@@ -31,3 +31,3 @@
 
-class QListView;
+class Q3ListView;