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/kolab/kcal/resourcekolab.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'kresources/kolab/kcal/resourcekolab.cpp')

diff --git a/kresources/kolab/kcal/resourcekolab.cpp b/kresources/kolab/kcal/resourcekolab.cpp
index 59f6a3558..da2cee412 100644
--- a/kresources/kolab/kcal/resourcekolab.cpp
+++ b/kresources/kolab/kcal/resourcekolab.cpp
@@ -423,7 +423,7 @@ void ResourceKolab::resolveConflict( KCal::Incidence* inc, const TQString& subre
      addedIncidence = inc;
    } else if ( result == 0 ) { // take both
      addedIncidence = inc;
-     addedIncidence->setSummary( i18n("Copy of: %1").arg( addedIncidence->summary() ) );
+     addedIncidence->setSummary( i18n("Copy of: %1").tqarg( addedIncidence->summary() ) );
      addedIncidence->setUid( CalFormat::createUniqueId() );
      localIncidence = local;
    }
@@ -604,24 +604,24 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
       }
       text += "<font></b><br>";
       if ( !incidence->summary().isEmpty() )
-        text += i18n( "<b>Summary:</b> %1" ).arg( incidence->summary() ) + "<br>";
+        text += i18n( "<b>Summary:</b> %1" ).tqarg( incidence->summary() ) + "<br>";
       if ( !incidence->location().isEmpty() )
-        text += i18n( "<b>Location:</b> %1" ).arg( incidence->location() );
+        text += i18n( "<b>Location:</b> %1" ).tqarg( incidence->location() );
       text += "<br>";
       if ( !incidence->doesFloat() )
         text += i18n( "<b>Start:</b> %1, %2" )
-                .arg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
+                .tqarg( incidence->dtStartDateStr(), incidence->dtStartTimeStr() );
       else
-        text += i18n( "<b>Start:</b> %1" ).arg( incidence->dtStartDateStr() );
+        text += i18n( "<b>Start:</b> %1" ).tqarg( incidence->dtStartDateStr() );
       text += "<br>";
       if ( incidence->type() == "Event" ) {
         Event* event = static_cast<Event*>( incidence );
         if ( event->hasEndDate() ) {
           if ( !event->doesFloat() ) {
             text += i18n( "<b>End:</b> %1, %2" )
-                    .arg( event->dtEndDateStr(), event->dtEndTimeStr() );
+                    .tqarg( event->dtEndDateStr(), event->dtEndTimeStr() );
           } else {
-            text += i18n( "<b>End:</b> %1" ).arg( event->dtEndDateStr() );
+            text += i18n( "<b>End:</b> %1" ).tqarg( event->dtEndDateStr() );
           }
         }
         text += "<br>";
@@ -711,7 +711,7 @@ bool ResourceKolab::addIncidence( KCal::Incidence* incidence, const TQString& _s
 
           /* Will be needed when kmail triggers a delete, so we don't delete the inocent
            * incidence that's sharing the uid with this one */
-          mOriginalUID2fakeUID[qMakePair( incidence->schedulingID(), subResource )] = uid;
+          mOriginalUID2fakeUID[tqMakePair( incidence->schedulingID(), subResource )] = uid;
         }
       }
       /* Add to the cache if the add didn't come from KOrganizer, in which case
-- 
cgit v1.2.1