1 files changed, 25 insertions, 21 deletions

diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index 4313998..a95db03 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -19,29 +19,33 @@
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qcheckbox.h>
-#include <qhbox.h>
+#include <q3hbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
-#include <qlistbox.h>
+#include <q3listbox.h>
 #include <qpushbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
 
 #ifndef KAB_EMBEDDED    
-#include <qtextedit.h>
+#include <q3textedit.h>
+//Added by qt3to4:
+#include <Q3GridLayout>
+#include <Q3PopupMenu>
+#include <Q3VBoxLayout>
 
 #include <kaccelmanager.h>
 #include "keywidget.h"
 #include "soundwidget.h"
 
 #else //KAB_EMBEDDED    
-#include <qmultilineedit.h>
+#include <q3multilineedit.h>
 #endif //KAB_EMBEDDED    
 
 
 #include "keywidget.h"
 #include "geowidget.h"
 #include "imagewidget.h"
@@ -127,13 +131,13 @@ void AddresseeEditorWidget::textChanged( const QString& )
 {
   emitModified();
 }
   
 void AddresseeEditorWidget::initGUI()
 {
-  QVBoxLayout *layout = new QVBoxLayout( this );
+  Q3VBoxLayout *layout = new Q3VBoxLayout( this );
 
   mTabWidget = new QTabWidget( this );
   layout->addWidget( mTabWidget );
 
   setupTab1();
   setupTab1_1();
@@ -157,13 +161,13 @@ void AddresseeEditorWidget::setupTab1()
   bool horLayout = false;
   int maxCol = 1;
   if ( QApplication::desktop()->width() == 640 || QApplication::desktop()->width() == 320 ) {
       horLayout = true;
       maxCol = 3;
   }
-  QGridLayout *layout = new QGridLayout( tab1, 7-maxCol, maxCol );
+  Q3GridLayout *layout = new Q3GridLayout( tab1, 7-maxCol, maxCol );
 
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
@@ -324,23 +328,23 @@ void AddresseeEditorWidget::setupTab1()
   layout->addColSpacing( 6, 50 );
   
   bar = new KSeparator( KSeparator::HLine, tab1 );
   layout->addMultiCellWidget( bar, 10, 10, 0, 6 );
 */  
   ///////////////////////////////////////
-      QHBox *categoryBox = new QHBox( tab1 ,"cato");
+      Q3HBox *categoryBox = new Q3HBox( tab1 ,"cato");
   categoryBox->setSpacing( KDialogBase::spacingHint() );
   categoryBox->setMargin( KDialogBase::marginHintSmall() );
   
   // Categories
   button = new QPushButton( i18n( "Categories" )+":", categoryBox );
   connect( button, SIGNAL( clicked() ), SLOT( categoryButtonClicked() ) );
 
   mCategoryEdit = new QPushButton ( categoryBox ); 
   mCategoryEdit->setSizePolicy( QSizePolicy(  QSizePolicy::Preferred  ,QSizePolicy::Fixed  ,FALSE) );
-  mCatPopup = new QPopupMenu ( categoryBox );
+  mCatPopup = new Q3PopupMenu ( categoryBox );
   mCategoryEdit->setPopup( mCatPopup );
   connect(mCatPopup,SIGNAL(aboutToShow ()  ), this ,SLOT(showCatPopup()));
   connect(mCatPopup,SIGNAL(  activated ( int ) ), this ,SLOT(selectedCatPopup( int )));
   //connect( mCategoryEdit, SIGNAL( textChanged( const QString& ) ), 
   //       SLOT( textChanged( const QString& ) ) );
 
@@ -408,13 +412,13 @@ void AddresseeEditorWidget::setCompany2FN()
 void AddresseeEditorWidget::setupTab1_1()
 {
   // This is the Address tab
   QWidget *tab1_1 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab1_1, 11, 7 );
-  QGridLayout *layout = new QGridLayout( tab1_1, 7, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( tab1_1, 7, 2 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   QPushButton *button;
@@ -609,13 +613,13 @@ qDebug("AddresseeEditorWidget::setupTab1 has to be changed");
 
 void AddresseeEditorWidget::setupTab2()
 {
   // This is the Details tab
   QWidget *tab2 = new QWidget( mTabWidget );
 
-  QGridLayout *layout = new QGridLayout( tab2, 8, 3 );
+  Q3GridLayout *layout = new Q3GridLayout( tab2, 8, 3 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   
@@ -688,13 +692,13 @@ void AddresseeEditorWidget::setupTab2()
       //layout->addMultiCellWidget( label, 6, 7, 0, 0 );
 
 
       int iii = 6;
 
       if ( QApplication::desktop()->width() == 640 ) {
-          QHBox * nbox = new QHBox ( tab2 );
+          Q3HBox * nbox = new Q3HBox ( tab2 );
           label = new QLabel( i18n( "Nick name:" )+" ", nbox );
           mNicknameEdit = new KLineEdit(  nbox );
           connect( mNicknameEdit, SIGNAL( textChanged( const QString& ) ),
                    SLOT( textChanged( const QString& ) ) );
           label->setBuddy( mNicknameEdit );
 
@@ -732,13 +736,13 @@ void AddresseeEditorWidget::setupTab2()
       connect( mChildEdit, SIGNAL( textChanged( const QString& ) ),
                SLOT( textChanged( const QString& ) ) );
       label->setBuddy( mChildEdit );
       layout->addWidget( mChildEdit, iii, 2 );
       ++iii;
       if ( QApplication::desktop()->width() == 640 ) {
-          QHBox * nbox = new QHBox ( tab2 );
+          Q3HBox * nbox = new Q3HBox ( tab2 );
           label = new QLabel( i18n( "Birthday:" )+" ", nbox );
           mBirthdayPicker = new KDateEdit(  nbox  );
           //mBirthdayPicker->toggleDateFormat();
           mBirthdayPicker->setHandleInvalid( true );
           connect( mBirthdayPicker, SIGNAL( dateChanged( QDate ) ),
                    SLOT( dateChanged( QDate ) ) );
@@ -801,13 +805,13 @@ void AddresseeEditorWidget::setupTab2()
 
 void AddresseeEditorWidget::setupTab2_1()
 {
   // This is the Details tab
   QWidget *tab2_2 = new QWidget( mTabWidget );
 
-  QGridLayout *layout = new QGridLayout( tab2_2, 1, 2 );
+  Q3GridLayout *layout = new Q3GridLayout( tab2_2, 1, 2 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
   
   QLabel *label;
   KSeparator* bar;
   
@@ -923,18 +927,18 @@ void AddresseeEditorWidget::setupTab2_1()
   // Notes
   label = new QLabel( i18n( "Note:" ), tab2_2 );
   label->setAlignment( Qt::AlignTop | Qt::AlignLeft );
 //US  layout->addWidget( label, 7, 0 );
   layout->addWidget( label, 0, 0 );
 #ifndef KAB_EMBEDDED    
-  mNoteEdit = new QTextEdit( tab2_2 );
-  mNoteEdit->setWordWrap( QTextEdit::WidgetWidth );
+  mNoteEdit = new Q3TextEdit( tab2_2 );
+  mNoteEdit->setWordWrap( Q3TextEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #else //KAB_EMBEDDED    
-  mNoteEdit = new QMultiLineEdit( tab2_2 );
-  mNoteEdit->setWordWrap( QMultiLineEdit::WidgetWidth );
+  mNoteEdit = new Q3MultiLineEdit( tab2_2 );
+  mNoteEdit->setWordWrap( Q3MultiLineEdit::WidgetWidth );
   mNoteEdit->setMinimumSize( mNoteEdit->sizeHint() );
 #endif //KAB_EMBEDDED    
   
   connect( mNoteEdit, SIGNAL( textChanged() ), SLOT( emitModified() ) );
   label->setBuddy( mNoteEdit );
 //US  layout->addMultiCellWidget( mNoteEdit, 7, 7, 1, 5 );
@@ -950,13 +954,13 @@ void AddresseeEditorWidget::setupTab2_1()
 
 void AddresseeEditorWidget::setupTab3()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
-  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
 //US  layout->setColStretch( 2, 1 );
   
   //////////////////////////////////////
   // Geo
@@ -1002,13 +1006,13 @@ qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be
 void AddresseeEditorWidget::setupTab3_1()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab3, 2, 3 );
-  QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
+  Q3GridLayout *layout = new Q3GridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHint() );
   layout->setSpacing( KDialogBase::spacingHint() );
 //US  layout->setColStretch( 2, 1 );
 
 /*US  
   //////////////////////////////////////
@@ -1427,9 +1431,9 @@ QString AddresseeEditorWidget::title() const
 
 QString AddresseeEditorWidget::identifier() const
 {
   return i18n( "contact_editor" );
 }
 
-#ifndef KAB_EMBEDDED    
-#include "addresseeeditorwidget.moc"
+#ifndef KAB_EMBEDDED_
+#include "moc_addresseeeditorwidget.cpp"
 #endif //KAB_EMBEDDED