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
---
 kresources/birthdays/resourcekabc.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'kresources/birthdays')

diff --git a/kresources/birthdays/resourcekabc.cpp b/kresources/birthdays/resourcekabc.cpp
index 815df5ca9..f3be66d83 100644
--- a/kresources/birthdays/resourcekabc.cpp
+++ b/kresources/birthdays/resourcekabc.cpp
@@ -163,13 +163,13 @@ bool ResourceKABC::doLoad()
     TQDate birthdate = (*it).birthday().date();
     TQString name_1, email_1, uid_1;
     if ( birthdate.isValid() ) {
-      kdDebug(5800) << "found a birthday " << birthdate.toString() << endl;
+      kdDebug(5800) << "found a birthday " << TQString(birthdate.toString()) << endl;
 
       name_1 = (*it).nickName();
       email_1 = (*it).fullEmail();
       uid_1 = (*it).uid();
       if (name_1.isEmpty()) name_1 = (*it).realName();
-      summary = i18n("%1's birthday").arg( name_1 );
+      summary = i18n("%1's birthday").tqarg( name_1 );
 
 
       Event *ev = new Event();
@@ -214,13 +214,13 @@ bool ResourceKABC::doLoad()
 
       ev->setReadOnly( true );
       mCalendar.addEvent(ev);
-      kdDebug(5800) << "imported " << birthdate.toString() << endl;
+      kdDebug(5800) << "imported " << TQString(birthdate.toString()) << endl;
     }
 
     TQString anniversary_string = (*it).custom( "KADDRESSBOOK", "X-Anniversary" );
     if (anniversary_string.isEmpty() )
       continue;
-    TQDateTime anniversary = TQDate::fromString( anniversary_string, TQt::ISODate );
+    TQDateTime anniversary = TQDate::fromString( anniversary_string, Qt::ISODate );
     if ( !anniversary.isValid() )
       continue;
 
@@ -232,8 +232,8 @@ bool ResourceKABC::doLoad()
       for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
         if ( name == (*addrIt).realName() ) {
           TQDate spouseAnniversary =
-            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
-          if ( anniversary == spouseAnniversary ) {
+            TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+          if ( anniversary == TQDateTime(spouseAnniversary) ) {
             found = true;
             break;
 
@@ -247,8 +247,8 @@ bool ResourceKABC::doLoad()
   }
 
   for ( addrIt = anniversaries.begin(); addrIt != anniversaries.end(); ++addrIt ) {
-    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), TQt::ISODate );
-    kdDebug(5800) << "found a anniversary " << anniversary.toString() << endl;
+    TQDate anniversary = TQDate::fromString( (*addrIt).custom( "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate );
+    kdDebug(5800) << "found a anniversary " << TQString(anniversary.toString()) << endl;
     TQString name;
     TQString name_1 = (*addrIt).nickName();
     TQString uid_1 = (*addrIt).uid();
@@ -276,10 +276,10 @@ bool ResourceKABC::doLoad()
         name_2 = spouse.realName();
       }
       summary = i18n("insert names of both spouses",
-                     "%1's & %2's anniversary").arg( name_1 ).arg( name_2 );
+                     "%1's & %2's anniversary").tqarg( name_1 ).tqarg( name_2 );
     } else {
       summary = i18n("only one spouse in addressbook, insert the name",
-                     "%1's anniversary").arg( name_1 );
+                     "%1's anniversary").tqarg( name_1 );
     }
 
     Event *ev = new Event();
@@ -328,7 +328,7 @@ bool ResourceKABC::doLoad()
 
     ev->setReadOnly( true );
     mCalendar.addEvent(ev);
-    kdDebug(5800) << "imported " << anniversary.toString() << endl;
+    kdDebug(5800) << "imported " << TQString(anniversary.toString()) << endl;
   }
 
   return true;
-- 
cgit v1.2.1