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
---
 korganizer/koeditorgeneral.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'korganizer/koeditorgeneral.cpp')

diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index 3a15188a..afbda615 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -426,7 +426,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence )
         remStr = remStr.left( maxLen );
         remStr += etc;
       }
-      mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) );
+      mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) );
     }
   } else {  // alarm count is 1
     Alarm *alarm = mAlarmList.first();
@@ -465,7 +465,7 @@ void KOEditorGeneral::updateAlarmWidgets( Incidence *incidence )
       mSimpleAlarmBox->hide();
       if ( incidence ) {
         TQString remStr = IncidenceFormatter::reminderStringList( incidence ).first();
-        mAlarmInfoLabel->setText( i18n( "Triggers %1" ).arg( remStr ) );
+        mAlarmInfoLabel->setText( i18n( "Triggers %1" ).tqarg( remStr ) );
       }
     }
   }
@@ -497,7 +497,7 @@ void KOEditorGeneral::readIncidence( Incidence *incidence, Calendar *calendar )
 
   TQString resLabel = IncidenceFormatter::resourceString( calendar, incidence );
   if ( !resLabel.isEmpty() ) {
-    mResourceLabel->setText( i18n( "Calendar: %1" ).arg( resLabel ) );
+    mResourceLabel->setText( i18n( "Calendar: %1" ).tqarg( resLabel ) );
     mResourceLabel->show();
   }
 }
@@ -573,7 +573,7 @@ void KOEditorGeneral::setDescription( const TQString &text )
 
 TQObject *KOEditorGeneral::typeAheadReceiver() const
 {
-  return mSummaryEdit;
+  return TQT_TQOBJECT(mSummaryEdit);
 }
 
 void KOEditorGeneral::updateAttendeeSummary(int count)
-- 
cgit v1.2.3