From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 14 Apr 2011 20:16:30 +0000
Subject: 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
---
 kaddressbook/ldapsearchdialog.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'kaddressbook/ldapsearchdialog.cpp')

diff --git a/kaddressbook/ldapsearchdialog.cpp b/kaddressbook/ldapsearchdialog.cpp
index f23049909..19b5dd6cf 100644
--- a/kaddressbook/ldapsearchdialog.cpp
+++ b/kaddressbook/ldapsearchdialog.cpp
@@ -152,7 +152,7 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
                                        page );
   groupBox->setFrameShape( TQGroupBox::Box );
   groupBox->setFrameShadow( TQGroupBox::Sunken );
-  groupBox->setColumnLayout( 0, TQt::Vertical );
+  groupBox->setColumnLayout( 0, Qt::Vertical );
   TQGridLayout *boxLayout = new TQGridLayout( groupBox->tqlayout(), 2,
                                             5, spacingHint() );
   boxLayout->setColStretch( 1, 1 );
@@ -202,9 +202,9 @@ LDAPSearchDialog::LDAPSearchDialog( KABC::AddressBook *ab, KABCore *core,
   mResultListView->setShowSortIndicator( true );
   topLayout->addWidget( mResultListView );
 
-  KButtonBox *buttons = new KButtonBox( page, TQt::Horizontal );
-  buttons->addButton( i18n( "Select All" ), this, TQT_SLOT( slotSelectAll() ) );
-  buttons->addButton( i18n( "Unselect All" ), this, TQT_SLOT( slotUnselectAll() ) );
+  KButtonBox *buttons = new KButtonBox( page, Qt::Horizontal );
+  buttons->addButton( i18n( "Select All" ), TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ) );
+  buttons->addButton( i18n( "Unselect All" ), TQT_TQOBJECT(this), TQT_SLOT( slotUnselectAll() ) );
 
   topLayout->addWidget( buttons );
 
@@ -264,7 +264,7 @@ void LDAPSearchDialog::restoreSettings()
   } else {
     mIsOK = true;
     for ( int j = 0; j < mNumHosts; ++j ) {
-      KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, this, "ldapclient" );
+      KPIM::LdapClient* ldapClient = new KPIM::LdapClient( 0, TQT_TQOBJECT(this), "ldapclient" );
       KPIM::LdapServer ldapServer;
       KPIM::LdapSearch::readConfig( ldapServer, config, j, true );
       ldapClient->setServer( ldapServer );
@@ -361,15 +361,15 @@ TQString LDAPSearchDialog::makeFilter( const TQString& query, const TQString& at
 
   if ( attr == i18n( "Name" ) ) {
     result += startsWith ? "|(cn=%1*)(sn=%2*)" : "|(cn=*%1*)(sn=*%2*)";
-    result = result.arg( query ).arg( query );
+    result = result.tqarg( query ).tqarg( query );
   } else {
     result += (startsWith ? "%1=%2*" : "%1=*%2*");
     if ( attr == i18n( "Email" ) ) {
-      result = result.arg( "mail" ).arg( query );
+      result = result.tqarg( "mail" ).tqarg( query );
     } else if ( attr == i18n( "Home Number" ) ) {
-      result = result.arg( "homePhone" ).arg( query );
+      result = result.tqarg( "homePhone" ).tqarg( query );
     } else if ( attr == i18n( "Work Number" ) ) {
-      result = result.arg( "telephoneNumber" ).arg( query );
+      result = result.tqarg( "telephoneNumber" ).tqarg( query );
     } else {
       // Error?
       result = TQString();
@@ -573,7 +573,7 @@ KABC::Addressee::List LDAPSearchDialog::importContactsUnlessTheyExist( const TQV
 
       if ( existing.isEmpty() ) {
         addr.setUid( KApplication::randomString( 10 ) );
-        addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).arg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
+        addr.setNote( i18n( "arguments are host name, datetime", "Imported from LDAP directory %1 on %2" ).tqarg( d->itemToServer[cli], KGlobal::locale()->formatDateTime( now ) ) );
         addr.setResource( resource );
         mCore->addressBook()->insertAddressee( addr );
         TQString displayString;
-- 
cgit v1.2.1