initial public commit of qt4 portp1

1 files changed, 18 insertions, 14 deletions

diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index eec5e08..6ecf66d 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -39,3 +39,3 @@
 #include <qcheckbox.h>
-#include <qgroupbox.h>
+#include <q3groupbox.h>
 #include <qlabel.h>
@@ -45,2 +45,6 @@
 #include <qapplication.h>
+#include <QDesktopWidget>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3Frame>
 
@@ -51,7 +55,7 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
 {
-  QGridLayout *topLayout = new QGridLayout( this, 2, 1, KDialog::marginHint(),
+  Q3GridLayout *topLayout = new Q3GridLayout( this, 2, 1, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
-  QGroupBox *photoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
-  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 3, 2,
+  Q3GroupBox *photoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
+  Q3GridLayout *boxLayout = new Q3GridLayout( photoBox->layout(), 3, 2,
                                             KDialog::spacingHint() );
@@ -65,3 +69,3 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   mPhotoLabel->setScaledContents( true );
-  mPhotoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+  mPhotoLabel->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken );
   boxLayout->addMultiCellWidget( mPhotoLabel, 0, 3, 0, 0 );
@@ -77,3 +81,3 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   boxLayout->addWidget( mPhotoUrl, 0, 1 );
-  QHBox *hb1 = new QHBox ( photoBox );
+  Q3HBox *hb1 = new Q3HBox ( photoBox );
   mUsePhotoUrl = new QCheckBox( i18n( "Store as URL" ), hb1 );
@@ -88,4 +92,4 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
 
-  QGroupBox *logoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
-  boxLayout = new QGridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
+  Q3GroupBox *logoBox = new Q3GroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
+  boxLayout = new Q3GridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
   boxLayout->setRowStretch( 2, 1 );
@@ -95,3 +99,3 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   mLogoLabel->setScaledContents( true );
-  mLogoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
+  mLogoLabel->setFrameStyle( Q3Frame::Panel | Q3Frame::Sunken );
   boxLayout->addMultiCellWidget( mLogoLabel, 0, 3, 0, 0 );
@@ -106,3 +110,3 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   
-  QHBox *hb2 = new QHBox ( logoBox );
+  Q3HBox *hb2 = new Q3HBox ( logoBox );
   mUseLogoUrl = new QCheckBox( i18n( "Store as URL" ), hb2 );
@@ -182,3 +186,3 @@ KABC::Picture ImageWidget::photo() const
   else {
-    QPixmap *px = mPhotoLabel->pixmap();
+    const QPixmap *px = mPhotoLabel->pixmap();
     if ( px ) {
@@ -234,3 +238,3 @@ KABC::Picture ImageWidget::logo() const
   else {
-    QPixmap *px = mLogoLabel->pixmap();
+    const QPixmap *px = mLogoLabel->pixmap();
     if ( px ) {
@@ -294,4 +298,4 @@ QPixmap ImageWidget::loadPixmap( const QString &url )
 
-#ifndef KAB_EMBEDDED
-#include "imagewidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_imagewidget.cpp"
 #endif //KAB_EMBEDDED