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

10 files changed, 39 insertions, 39 deletions

diff --git a/kresources/scalix/kabc/contact.cpp b/kresources/scalix/kabc/contact.cpp
index b8abb42aa..f9a02d448 100644
--- a/kresources/scalix/kabc/contact.cpp
+++ b/kresources/scalix/kabc/contact.cpp
@@ -71,7 +71,7 @@ TQString Contact::toXml( const KABC::Addressee &addr )
   xml += "<reminder_set>" + custom( "reminder_set", addr, "false" ) + "</reminder_set>\n";
   xml += "<send_rich_info>" + custom( "send_rich_info", addr, "false" ) + "</send_rich_info>\n";
   xml += "<subject>" + addr.formattedName() + "</subject>\n";
-  xml += "<last_modification_time>" + addr.revision().toString( TQt::ISODate ) + "</last_modification_time>\n";
+  xml += "<last_modification_time>" + addr.revision().toString( Qt::ISODate ) + "</last_modification_time>\n";
 
   xml += "<display_name_prefix>" + addr.prefix() + "</display_name_prefix>\n";
   xml += "<first_name>" + addr.givenName() + "</first_name>\n";
@@ -103,19 +103,19 @@ TQString Contact::toXml( const KABC::Addressee &addr )
         comment = addr.formattedName();
         display = emails[ i ];
       } else {
-        comment = custom( TQString( "email%1_address_with_comment" ).arg( i + 1 ), addr );
-        display = custom( TQString( "email%1_display_name" ).arg( i + 1 ), addr );
+        comment = custom( TQString( "email%1_address_with_comment" ).tqarg( i + 1 ), addr );
+        display = custom( TQString( "email%1_display_name" ).tqarg( i + 1 ), addr );
       }
     }
 
-    xml += TQString( "<email%1_address_type>" ).arg( i + 1 ) + type +
-           TQString( "</email%1_address_type>" ).arg( i + 1 ) +"\n";
-    xml += TQString( "<email%1_address>" ).arg( i + 1 ) + address +
-           TQString( "</email%1_address>" ).arg( i + 1 ) +"\n";
-    xml += TQString( "<email%1_address_with_comment>" ).arg( i + 1 ) + comment +
-           TQString( "</email%1_address_with_comment>" ).arg( i + 1 ) + "\n";
-    xml += TQString( "<email%1_display_name>" ).arg( i + 1 ) + display +
-           TQString( "</email%1_display_name>" ).arg( i + 1 ) + "\n";
+    xml += TQString( "<email%1_address_type>" ).tqarg( i + 1 ) + type +
+           TQString( "</email%1_address_type>" ).tqarg( i + 1 ) +"\n";
+    xml += TQString( "<email%1_address>" ).tqarg( i + 1 ) + address +
+           TQString( "</email%1_address>" ).tqarg( i + 1 ) +"\n";
+    xml += TQString( "<email%1_address_with_comment>" ).tqarg( i + 1 ) + comment +
+           TQString( "</email%1_address_with_comment>" ).tqarg( i + 1 ) + "\n";
+    xml += TQString( "<email%1_display_name>" ).tqarg( i + 1 ) + display +
+           TQString( "</email%1_display_name>" ).tqarg( i + 1 ) + "\n";
   }
 
   KABC::PhoneNumber phone = addr.phoneNumber( KABC::PhoneNumber::Home );
@@ -166,7 +166,7 @@ TQString Contact::toXml( const KABC::Addressee &addr )
   xml += "<office_location>" + addr.custom( "KADDRESSBOOK", "X-Office" ) + "</office_location>\n";
   xml += "<spouse>" + addr.custom( "KADDRESSBOOK", "X-SpousesName" ) + "</spouse>\n";
 
-  xml += "<bday>" + addr.birthday().toString( TQt::ISODate ) + "</bday>\n";
+  xml += "<bday>" + addr.birthday().toString( Qt::ISODate ) + "</bday>\n";
   xml += "<anniversary>" + addr.custom( "KADDRESSBOOK", "X-Anniversary" ) + "</anniversary>\n";
 
   xml += "<mapi_charset>" + custom( "mapi_charset", addr, "UTF8" ) + "</mapi_charset>";
@@ -235,7 +235,7 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
       else if ( element.tagName() == "send_rich_info" )
         setCustom( "send_rich_info", element.text(), addr );
       else if ( element.tagName() == "last_modification_time" )
-        addr.setRevision( TQDateTime::fromString( element.text(), TQt::ISODate ) );
+        addr.setRevision( TQDateTime::fromString( element.text(), Qt::ISODate ) );
 
       // name
       else if ( element.tagName() == "display_name_prefix" )
@@ -352,7 +352,7 @@ KABC::Addressee Contact::fromXml( const TQString &xml )
         addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", element.text() );
 
       else if ( element.tagName() == "bday" )
-        addr.setBirthday( TQDateTime::fromString( element.text(), TQt::ISODate ) );
+        addr.setBirthday( TQDateTime::fromString( element.text(), Qt::ISODate ) );
       else if ( element.tagName() == "anniversary" )
         addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", element.text() );
       else
diff --git a/kresources/scalix/kcal/resourcescalix.cpp b/kresources/scalix/kcal/resourcescalix.cpp
index 8c84977a8..a67585ee0 100644
--- a/kresources/scalix/kcal/resourcescalix.cpp
+++ b/kresources/scalix/kcal/resourcescalix.cpp
@@ -325,7 +325,7 @@ void ResourceScalix::resolveConflict( KCal::Incidence* inc, const TQString& subr
       } else if ( result == 0 ) { // take both
           localIncidence = local->clone();
           localIncidence->recreate();
-          localIncidence->setSummary( i18n("Copy of: %1").arg(localIncidence->summary()) );
+          localIncidence->setSummary( i18n("Copy of: %1").tqarg(localIncidence->summary()) );
           addedIncidence = inc;
       }
       bool silent = mSilent;
diff --git a/kresources/scalix/kioslave/scalix.cpp b/kresources/scalix/kioslave/scalix.cpp
index c3a8f99b0..d5603af92 100644
--- a/kresources/scalix/kioslave/scalix.cpp
+++ b/kresources/scalix/kioslave/scalix.cpp
@@ -104,14 +104,14 @@ void Scalix::retrieveFreeBusy( const KURL &url )
   TQByteArray packedArgs;
   TQDataStream stream( packedArgs, IO_WriteOnly );
 
-  const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).arg( requestUser );
-  const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).arg( argument.length() );
+  const TQString argument = TQString( "BEGIN:VFREEBUSY\nATTENDEE:MAILTO:%1\nEND:VFREEBUSY" ).tqarg( requestUser );
+  const TQString command = TQString( "X-GET-ICAL-FREEBUSY {%1}" ).tqarg( argument.length() );
 
   stream << (int) 'X' << 'E' << command << argument;
 
-  TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+  TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
                                                    url.user() : url.user() + ":" + url.pass() )
-                                                .arg( url.host() );
+                                                .tqarg( url.host() );
 
   mFreeBusyData = TQString();
 
@@ -134,7 +134,7 @@ void Scalix::publishFreeBusy( const KURL &url )
   TQString path = url.path();
 
   // extract user name
-  int lastSlash = path.findRev( '/' );
+  int lastSlash = path.tqfindRev( '/' );
   if ( lastSlash != -1 )
     requestUser = path.mid( lastSlash + 1 );
 
@@ -173,13 +173,13 @@ void Scalix::publishFreeBusy( const KURL &url )
   TQDataStream stream( packedArgs, IO_WriteOnly );
 
   const TQString argument = TQString::fromUtf8( data );
-  const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).arg( argument.length() );
+  const TQString command = TQString( "X-PUT-ICAL-FREEBUSY Calendar {%1}" ).tqarg( argument.length() );
 
   stream << (int) 'X' << 'E' << command << argument;
 
-  TQString imapUrl = TQString( "imap://%1@%3/" ).arg( url.pass().isEmpty() ?
+  TQString imapUrl = TQString( "imap://%1@%3/" ).tqarg( url.pass().isEmpty() ?
                                                    url.user() : url.user() + ":" + url.pass() )
-                                                .arg( url.host() );
+                                                .tqarg( url.host() );
 
   KIO::SimpleJob *job = KIO::special( imapUrl, packedArgs, false );
   connect( job, TQT_SIGNAL( result( KIO::Job* ) ),
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;
diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index c9c7ee11d..c9bfca350 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource,
 TQString ResourceScalixBase::configFile( const TQString& type ) const
 {
   return locateLocal( "config",
-                      TQString( "kresources/scalix/%1rc" ).arg( type ) );
+                      TQString( "kresources/scalix/%1rc" ).tqarg( type ) );
 }
 
 bool ResourceScalixBase::connectToKMail() const
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 64400e4f8..337899035 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree()
 
 TQString ScalixBase::dateTimeToString( const TQDateTime& time )
 {
-  return time.toString( TQt::ISODate ) + 'Z';
+  return time.toString( Qt::ISODate ) + 'Z';
 }
 
 TQString ScalixBase::dateToString( const TQDate& date )
 {
-  return date.toString( TQt::ISODate );
+  return date.toString( Qt::ISODate );
 }
 
 TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
@@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
   TQString date( _date );
   if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return TQDateTime::fromString( date, TQt::ISODate );
+  return TQDateTime::fromString( date, Qt::ISODate );
 }
 
 TQDate ScalixBase::stringToDate( const TQString& date )
 {
-  return TQDate::fromString( date, TQt::ISODate );
+  return TQDate::fromString( date, Qt::ISODate );
 }
 
 TQString ScalixBase::sensitivityToString( Sensitivity s )