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

1 files changed, 14 insertions, 14 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