initial public commit of qt4 portp1

1 files changed, 20 insertions, 16 deletions

diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index 168d39e..8055085 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -23,8 +23,12 @@
 
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3HBoxLayout>
 
@@ -47,3 +51,3 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
   {
-    QGridLayout* layout = new QGridLayout( this, 1, 1, KDialog::marginHintSmall(),
+    Q3GridLayout* layout = new Q3GridLayout( this, 1, 1, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
@@ -53,3 +57,3 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
     
-    mBox = new QListBox( this );
+    mBox = new Q3ListBox( this );
     mBox->setMaximumSize(70, 70);
@@ -72,9 +76,9 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
   {
-    QHBoxLayout *layout = new QHBoxLayout( this );
+    Q3HBoxLayout *layout = new Q3HBoxLayout( this );
 
-    QGroupBox *group = new QGroupBox( 0, Qt::Vertical, title, this );
-    QGridLayout *groupLayout = new QGridLayout( group->layout(), 2, 2,
+    Q3GroupBox *group = new Q3GroupBox( 0, Qt::Vertical, title, this );
+    Q3GridLayout *groupLayout = new Q3GridLayout( group->layout(), 2, 2,
                                               KDialog::spacingHint() );
 
-    mBox = new QListBox( group );
+    mBox = new Q3ListBox( group );
     
@@ -99,4 +103,4 @@ NamePartWidget::NamePartWidget( const QString &title, QWidget *parent,
 
-  connect( mBox, SIGNAL( selectionChanged( QListBoxItem* ) ),
-           SLOT( selectionChanged( QListBoxItem* ) ) );
+  connect( mBox, SIGNAL( selectionChanged( Q3ListBoxItem* ) ),
+           SLOT( selectionChanged( Q3ListBoxItem* ) ) );
   connect( mEdit, SIGNAL( textChanged( const QString& ) ),
@@ -145,3 +149,3 @@ void NamePartWidget::remove()
 
-void NamePartWidget::selectionChanged( QListBoxItem *item )
+void NamePartWidget::selectionChanged( Q3ListBoxItem *item )
 {
@@ -159,3 +163,3 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
 {
-  QGridLayout *layout;
+  Q3GridLayout *layout;
 
@@ -180,3 +184,3 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   {
-    layout = new QGridLayout( this, 4, 2, KDialog::marginHintSmall(),
+    layout = new Q3GridLayout( this, 4, 2, KDialog::marginHintSmall(),
                                          KDialog::spacingHintSmall() );
@@ -192,3 +196,3 @@ AddresseeWidget::AddresseeWidget( QWidget *parent, const char *name )
   {
-    layout = new QGridLayout( this, 2, 3, KDialog::marginHint(),
+    layout = new Q3GridLayout( this, 2, 3, KDialog::marginHint(),
                                          KDialog::spacingHint() );
@@ -235,4 +239,4 @@ void AddresseeWidget::saveSettings()
 
-#ifndef KAB_EMBEDDED
-#include "addresseewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addresseewidget.cpp"
 #endif //KAB_EMBEDDED