Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 12 insertions, 12 deletions

diff --git a/kaddressbook/kcmconfigs/addresseewidget.cpp b/kaddressbook/kcmconfigs/addresseewidget.cpp
index b68e96c67..f1a3f525d 100644
--- a/kaddressbook/kcmconfigs/addresseewidget.cpp
+++ b/kaddressbook/kcmconfigs/addresseewidget.cpp
@@ -46,7 +46,7 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
 {
   TQHBoxLayout *tqlayout = new TQHBoxLayout( this );
 
-  TQGroupBox *group = new TQGroupBox( 0, TQt::Vertical, title, this );
+  TQGroupBox *group = new TQGroupBox( 0, Qt::Vertical, title, this );
   TQGridLayout *groupLayout = new TQGridLayout( group->tqlayout(), 2, 2,
                                               KDialog::spacingHint() );
 
@@ -55,11 +55,11 @@ NamePartWidget::NamePartWidget( const TQString &title, const TQString &label,
            TQT_SLOT( selectionChanged( TQListBoxItem* ) ) );
   groupLayout->addWidget( mBox, 0, 0 );
 
-  KButtonBox *bbox = new KButtonBox( group, TQt::Vertical );
-  mAddButton = bbox->addButton( i18n( "Add..." ), this,  TQT_SLOT( add() ) );
-  mEditButton = bbox->addButton( i18n( "Edit..." ), this,  TQT_SLOT( edit() ) );
+  KButtonBox *bbox = new KButtonBox( group, Qt::Vertical );
+  mAddButton = bbox->addButton( i18n( "Add..." ), TQT_TQOBJECT(this),  TQT_SLOT( add() ) );
+  mEditButton = bbox->addButton( i18n( "Edit..." ), TQT_TQOBJECT(this),  TQT_SLOT( edit() ) );
   mEditButton->setEnabled( false );
-  mRemoveButton = bbox->addButton( i18n( "Remove" ), this,  TQT_SLOT( remove() ) );
+  mRemoveButton = bbox->addButton( i18n( "Remove" ), TQT_TQOBJECT(this),  TQT_SLOT( remove() ) );
   mRemoveButton->setEnabled( false );
   bbox->tqlayout();
   groupLayout->addWidget( bbox, 0, 1 );
diff --git a/kaddressbook/kcmconfigs/kabconfigwidget.cpp b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
index c65255db4..f2899ba35 100644
--- a/kaddressbook/kcmconfigs/kabconfigwidget.cpp
+++ b/kaddressbook/kcmconfigs/kabconfigwidget.cpp
@@ -59,7 +59,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
   TQVBoxLayout *tqlayout = new TQVBoxLayout( generalPage, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
-  TQGroupBox *groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "General" ), generalPage );
+  TQGroupBox *groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "General" ), generalPage );
   TQBoxLayout *boxLayout = new TQVBoxLayout( groupBox->tqlayout() );
   boxLayout->tqsetAlignment( TQt::AlignTop );
 
@@ -96,7 +96,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
 
   tqlayout->addWidget( groupBox );
 
-  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Script-Hooks" ), generalPage );
+  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Script-Hooks" ), generalPage );
   TQGridLayout *grid = new TQGridLayout( groupBox->tqlayout(), 3, 2,
                                        KDialog::spacingHint() );
   label = new TQLabel( i18n( "Phone:" ), groupBox );
@@ -126,7 +126,7 @@ KABConfigWidget::KABConfigWidget( TQWidget *tqparent, const char *name )
 
   tqlayout->addWidget( groupBox );
 
-  groupBox = new TQGroupBox( 0, TQt::Vertical, i18n( "Location Map" ), generalPage );
+  groupBox = new TQGroupBox( 0, Qt::Vertical, i18n( "Location Map" ), generalPage );
   boxLayout = new TQVBoxLayout( groupBox->tqlayout(), KDialog::spacingHint() );
   boxLayout->tqsetAlignment( TQt::AlignTop );
 
@@ -171,7 +171,7 @@ void KABConfigWidget::restoreSettings()
   mFaxHook->setText( KABPrefs::instance()->faxHookApplication() );
   mAddresseeWidget->restoreSettings();
   mEditorCombo->setCurrentItem( KABPrefs::instance()->editorType() );
-  mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().arg( KGlobal::locale()->country() ) );
+  mLocationMapURL->setCurrentText( KABPrefs::instance()->locationMapURL().tqarg( KGlobal::locale()->country() ) );
   mLocationMapURL->lineEdit()->setCursorPosition( 0 );
 
   KConfig config( "kabcrc", false, false );
diff --git a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
index e0bbca236..996da4287 100644
--- a/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
+++ b/kaddressbook/kcmconfigs/ldapoptionswidget.cpp
@@ -288,10 +288,10 @@ void LDAPOptionsWidget::initGUI()
   tqlayout->addWidget( groupBox );
 
   KButtonBox *buttons = new KButtonBox( this );
-  buttons->addButton( i18n( "&Add Host..." ), this, TQT_SLOT( slotAddHost() ) );
-  mEditButton = buttons->addButton( i18n( "&Edit Host..." ), this, TQT_SLOT( slotEditHost() ) );
+  buttons->addButton( i18n( "&Add Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotAddHost() ) );
+  mEditButton = buttons->addButton( i18n( "&Edit Host..." ), TQT_TQOBJECT(this), TQT_SLOT( slotEditHost() ) );
   mEditButton->setEnabled( false );
-  mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), this, TQT_SLOT( slotRemoveHost() ) );
+  mRemoveButton = buttons->addButton( i18n( "&Remove Host" ), TQT_TQOBJECT(this), TQT_SLOT( slotRemoveHost() ) );
   mRemoveButton->setEnabled( false );
   buttons->tqlayout();