initial public commit of qt4 portp1

1 files changed, 10 insertions, 9 deletions

diff --git a/kaddressbook/viewconfigurewidget.cpp b/kaddressbook/viewconfigurewidget.cpp
index 666e188..047df8c 100644
--- a/kaddressbook/viewconfigurewidget.cpp
+++ b/kaddressbook/viewconfigurewidget.cpp
@@ -26,3 +26,3 @@
 
-#include <qvbox.h>
+#include <q3vbox.h>
 
@@ -39,2 +39,5 @@
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QPixmap>
 
@@ -52,3 +55,3 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, QWidget *parent
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this );
   
@@ -59,3 +62,3 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, QWidget *parent
   // Add the first page, the attributes
-  QVBox *page = addPage( i18n( "Fields" ), QString::null,
+  Q3VBox *page = addPage( i18n( "Fields" ), QString::null,
                          KGlobal::iconLoader()->loadIcon( "view_detailed",
@@ -95,3 +98,3 @@ void ViewConfigureWidget::saveSettings( KConfig *config )
     
-QVBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
+Q3VBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
                                    const QPixmap &pixmap )
@@ -101,3 +104,3 @@ QVBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
@@ -154,6 +157,4 @@ void ViewConfigureDialog::slotHelp()
 
-#ifndef KAB_EMBEDDED
-#include "viewconfigurewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_viewconfigurewidget.cpp"
 #endif //KAB_EMBEDDED
-
-