initial public commit of qt4 portp1

1 files changed, 9 insertions, 5 deletions

diff --git a/kaddressbook/incsearchwidget.cpp b/kaddressbook/incsearchwidget.cpp
index 5f8b83d..a54d1cd 100644
--- a/kaddressbook/incsearchwidget.cpp
+++ b/kaddressbook/incsearchwidget.cpp
@@ -25,7 +25,10 @@
 #include <qlayout.h>
 #include <qtooltip.h>
 #include <qapplication.h>
+#include <QDesktopWidget>
 #include <qcombobox.h>
+//Added by qt3to4:
+#include <Q3HBoxLayout>
 
 #include <kdialog.h>
 #include <klineedit.h>
@@ -37,17 +40,18 @@
 #include "incsearchwidget.h"
 
 IncSearchWidget::IncSearchWidget( QWidget *parent, const char *name )
-    : QWidget( parent, name )
 {
+    setObjectName(name);
+    setParent(parent);
 #ifndef KAB_EMBEDDED
 //US  setCaption( i18n( "Incremental Search" ) );
 #endif //KAB_EMBEDDED
 
-  QHBoxLayout *layout = new QHBoxLayout( this, 2, KDialog::spacingHint() );
+  Q3HBoxLayout *layout = new Q3HBoxLayout( this, 2, KDialog::spacingHint() );
 
 #ifdef DESKTOP_VERSION
   QLabel *label = new QLabel( i18n( "Search:" ), this );
-  label->setAlignment( QLabel::AlignVCenter | QLabel::AlignRight );
+  label->setAlignment( Qt::AlignVCenter | Qt::AlignRight );
   layout->addWidget( label );
 #endif //KAB_EMBEDDED
 
@@ -176,6 +180,6 @@ int IncSearchWidget::currentItem() const
   
   return mFieldCombo->currentItem();
 }
-#ifndef KAB_EMBEDDED
-#include "incsearchwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_incsearchwidget.cpp"
 #endif //KAB_EMBEDDED