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
@@ -24,7 +24,7 @@
 
 #ifndef KAB_EMBEDDED
 
-#include <qvbox.h>
+#include <q3vbox.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -37,6 +37,9 @@
 
 
 #include <qlayout.h>
+//Added by qt3to4:
+#include <Q3VBoxLayout>
+#include <QPixmap>
 
 #include <kjanuswidget.h>
 #include <kglobal.h>
@@ -50,14 +53,14 @@ ViewConfigureWidget::ViewConfigureWidget( KABC::AddressBook *ab, QWidget *parent
                                           const char *name )
   : ConfigureWidget( ab, parent, name )
 {
-  QVBoxLayout *topLayout = new QVBoxLayout( this );
+  Q3VBoxLayout *topLayout = new Q3VBoxLayout( this );
   
   mMainWidget = new KJanusWidget( this, "JanusWidget", KJanusWidget::Tabbed );
   
   topLayout->addWidget( mMainWidget );
 
   // 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",
                          KIcon::Panel, 16 ) );
 
@@ -93,13 +96,13 @@ void ViewConfigureWidget::saveSettings( KConfig *config )
   mFilterPage->saveSettings( config );
 }
     
-QVBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
+Q3VBox *ViewConfigureWidget::addPage( const QString &item, const QString &header,
                                    const QPixmap &pixmap )
 {
   return mMainWidget->addVBoxPage( item, header, pixmap );
 }
 
-#include <qframe.h>
+#include <q3frame.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <stdlib.h>
@@ -152,8 +155,6 @@ void ViewConfigureDialog::slotHelp()
 #endif //KAB_EMBEDDED
 }
 
-#ifndef KAB_EMBEDDED
-#include "viewconfigurewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_viewconfigurewidget.cpp"
 #endif //KAB_EMBEDDED
-
-