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

5 files changed, 11 insertions, 11 deletions

diff --git a/kresources/scalix/scalixadmin/jobs.cpp b/kresources/scalix/scalixadmin/jobs.cpp
index f1bce9f2c..2d6823918 100644
--- a/kresources/scalix/scalixadmin/jobs.cpp
+++ b/kresources/scalix/scalixadmin/jobs.cpp
@@ -73,7 +73,7 @@ SetPasswordJob* Scalix::setPassword( KIO::Slave* slave, const KURL& url,
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'X' << (int)'N'
-         << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).arg( oldPassword ).arg( newPassword );
+         << TQString( "X-SCALIX-PASSWORD" ) << TQString( "%1 %2" ).tqarg( oldPassword ).tqarg( newPassword );
 
   SetPasswordJob* job = new SetPasswordJob( url, packedArgs, false );
   KIO::Scheduler::assignJobToSlave( slave, job );
@@ -95,7 +95,7 @@ SetDelegateJob* Scalix::setDelegate( KIO::Slave* slave, const KURL& url, const T
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
   stream << (int)'X' << (int)'N'
-         << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).arg( email ).arg( types.join( " " ) );
+         << TQString( "X-SET-DELEGATE" ) << TQString( "%1 %2" ).tqarg( email ).tqarg( types.join( " " ) );
 
   SetDelegateJob* job = new SetDelegateJob( url, packedArgs, false );
   KIO::Scheduler::assignJobToSlave( slave, job );
@@ -164,9 +164,9 @@ GetOtherUsersJob* Scalix::getOtherUsers( KIO::Slave* slave, const KURL& url )
 SetOutOfOfficeJob* Scalix::setOutOfOffice( KIO::Slave* slave, const KURL& url, bool enabled, const TQString& msg )
 {
   const TQString argument = msg;
-  const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).arg( enabled ? "ENABLED" : "DISABLED" )
-                                                .arg( "UTF-8" )
-                                                .arg( msg.utf8().length() );
+  const TQString command = TQString( "X-SET-OUT-OF-OFFICE %1 %2 {%3}" ).tqarg( enabled ? "ENABLED" : "DISABLED" )
+                                                .tqarg( "UTF-8" )
+                                                .tqarg( msg.utf8().length() );
 
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
diff --git a/kresources/scalix/scalixadmin/ldapview.cpp b/kresources/scalix/scalixadmin/ldapview.cpp
index 04351395e..bade9e16b 100644
--- a/kresources/scalix/scalixadmin/ldapview.cpp
+++ b/kresources/scalix/scalixadmin/ldapview.cpp
@@ -85,8 +85,8 @@ void LdapView::setQuery( const TQString &query )
 
 void LdapView::entryAdded( const KABC::LdapObject &obj )
 {
-  const TQString text = TQString( "%1 (%2)" ).arg( obj.attrs[ "surname" ].first() )
-                                           .arg( obj.attrs[ "mail" ].first() );
+  const TQString text = TQString( "%1 (%2)" ).tqarg( TQString(obj.attrs[ "surname" ].first()) )
+                                           .tqarg( TQString(obj.attrs[ "mail" ].first()) );
 
   new LdapItem( this, text, obj.attrs[ "mail" ].first() );
 }
diff --git a/kresources/scalix/scalixadmin/outofofficepage.cpp b/kresources/scalix/scalixadmin/outofofficepage.cpp
index d56e8954e..7b2f2ac60 100644
--- a/kresources/scalix/scalixadmin/outofofficepage.cpp
+++ b/kresources/scalix/scalixadmin/outofofficepage.cpp
@@ -38,7 +38,7 @@ OutOfOfficePage::OutOfOfficePage( TQWidget *tqparent )
 {
   TQGridLayout *tqlayout = new TQGridLayout( this, 4, 2, 11, 6 );
 
-  TQButtonGroup *group = new TQButtonGroup( 1, TQt::Vertical, this );
+  TQButtonGroup *group = new TQButtonGroup( 1, Qt::Vertical, this );
 
   mDisabled = new TQRadioButton( i18n( "I am in the office" ), group );
   mDisabled->setChecked( true );
diff --git a/kresources/scalix/scalixadmin/passwordpage.cpp b/kresources/scalix/scalixadmin/passwordpage.cpp
index 53a163b83..0781e3a41 100644
--- a/kresources/scalix/scalixadmin/passwordpage.cpp
+++ b/kresources/scalix/scalixadmin/passwordpage.cpp
@@ -179,7 +179,7 @@ void PasswordPage::finished( KIO::Job* job )
         group.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
       }
 
-      KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).arg( group.readNumEntry( "Folder" ) ) );
+      KConfigGroup fileGroup( &config, TQString( "Folder-%1" ).tqarg( group.readNumEntry( "Folder" ) ) );
       fileGroup.writeEntry( "pass", KStringHandler::obscure( newPassword ) );
     }
   }
diff --git a/kresources/scalix/scalixadmin/settings.cpp b/kresources/scalix/scalixadmin/settings.cpp
index 52f72296f..d5c5cdb1c 100644
--- a/kresources/scalix/scalixadmin/settings.cpp
+++ b/kresources/scalix/scalixadmin/settings.cpp
@@ -92,8 +92,8 @@ TQString Settings::rulesWizardUrl() const
   TQString url = group.readEntry( "rulesWizardUrl" );
   if ( url.isEmpty() ) {
     KConfigGroup group( &config, "Account" );
-    url = TQString( "http://%1/Scalix/rw/?username=%2" ).arg( group.readEntry( "host" ) )
-                                                       .arg( group.readEntry( "user" ) );
+    url = TQString( "http://%1/Scalix/rw/?username=%2" ).tqarg( group.readEntry( "host" ) )
+                                                       .tqarg( group.readEntry( "user" ) );
   }
 
   return url;