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, 21 insertions, 21 deletions

diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 66534b694..54f60a3c4 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -913,7 +913,7 @@ TQString KAEvent::uid(const TQString& id, tqStatus status)
 	else
 	{
 		oldtqStatus = ACTIVE;
-		i = result.findRev('-');
+		i = result.tqfindRev('-');
 		len = 1;
 	}
 	if (status != oldtqStatus  &&  i > 0)
@@ -1000,7 +1000,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 	if (mEmailBcc)
 		cats.append(EMAIL_BCC_CATEGORY);
 	if (mKMailSerialNumber)
-		cats.append(TQString("%1%2").arg(KMAIL_SERNUM_CATEGORY).arg(mKMailSerialNumber));
+		cats.append(TQString("%1%2").tqarg(KMAIL_SERNUM_CATEGORY).tqarg(mKMailSerialNumber));
 	if (mCopyToKOrganizer)
 		cats.append(KORGANIZER_CATEGORY);
 	if (mCommandXterm)
@@ -1008,11 +1008,11 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 	else if (!mLogFile.isEmpty())
 		cats.append(LOG_CATEGORY + mLogFile);
 	if (mLateCancel)
-		cats.append(TQString("%1%2").arg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).arg(mLateCancel));
+		cats.append(TQString("%1%2").tqarg(mAutoClose ? AUTO_CLOSE_CATEGORY : LATE_CANCEL_CATEGORY).tqarg(mLateCancel));
 	if (mDeferDefaultMinutes)
-		cats.append(TQString("%1%2").arg(DEFER_CATEGORY).arg(mDeferDefaultMinutes));
+		cats.append(TQString("%1%2").tqarg(DEFER_CATEGORY).tqarg(mDeferDefaultMinutes));
 	if (!mTemplateName.isEmpty()  &&  mTemplateAfterTime >= 0)
-		cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(mTemplateAfterTime));
+		cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(mTemplateAfterTime));
 	if (mArchive  &&  !original)
 	{
 		TQStringList params;
@@ -1032,7 +1032,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 				unit = 'H';
 				count /= 60;
 			}
-			params += TQString("%1%2").arg(count).arg(unit);
+			params += TQString("%1%2").tqarg(count).tqarg(unit);
 		}
 		if (mArchiveRepeatAtLogin)
 			params += AT_LOGIN_TYPE;
@@ -1084,7 +1084,7 @@ bool KAEvent::updateKCalEvent(Event& ev, bool checkUid, bool original, bool canc
 	{
 		// Alarm repetition is normally held in the main alarm, but since
 		// the main alarm has expired, store in a custom property.
-		TQString param = TQString("%1:%2").arg(mRepeatInterval).arg(mRepeatCount);
+		TQString param = TQString("%1:%2").tqarg(mRepeatInterval).tqarg(mRepeatCount);
 		ev.setCustomProperty(APPNAME, REPEAT_PROPERTY, param);
 	}
 
@@ -1251,9 +1251,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 			}
 			if (!mAudioFile.isEmpty()  &&  mSoundVolume >= 0)
 				alarm->setCustomProperty(APPNAME, VOLUME_PROPERTY,
-				              TQString::tqfromLatin1("%1;%2;%3").arg(TQString::number(mSoundVolume, 'f', 2))
-				                                             .arg(TQString::number(mFadeVolume, 'f', 2))
-				                                             .arg(mFadeSeconds));
+				              TQString::tqfromLatin1("%1;%2;%3").tqarg(TQString::number(mSoundVolume, 'f', 2))
+				                                             .tqarg(TQString::number(mFadeVolume, 'f', 2))
+				                                             .tqarg(mFadeSeconds));
 			break;
 		case KAAlarm::PRE_ACTION_ALARM:
 			setProcedureAlarm(alarm, mPreAction);
@@ -1277,9 +1277,9 @@ Alarm* KAEvent::initKCalAlarm(Event& event, int startOffsetSecs, const TQStringL
 				case T_MESSAGE:
 					alarm->setDisplayAlarm(AlarmText::toCalendarText(mText));
 					alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
-						      TQString::tqfromLatin1("%1;%2;%3").arg(mBgColour.name())
-										     .arg(mFgColour.name())
-										     .arg(mDefaultFont ? TQString() : mFont.toString()));
+						      TQString::tqfromLatin1("%1;%2;%3").tqarg(mBgColour.name())
+										     .tqarg(mFgColour.name())
+										     .tqarg(mDefaultFont ? TQString() : mFont.toString()));
 					break;
 				case T_COMMAND:
 					if (mCommandScript)
@@ -2093,7 +2093,7 @@ TQString KAEvent::recurrenceText(bool brief) const
 				else
 				{
 					TQString mins;
-					return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(frequency/60)).arg(mins.sprintf("%02d", frequency%60));
+					return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(frequency/60)).tqarg(mins.sprintf("%02d", frequency%60));
 				}
 			case RecurrenceRule::rDaily:
 				return i18n("1 Day", "%n Days", frequency);
@@ -2125,7 +2125,7 @@ TQString KAEvent::repetitionText(bool brief) const
 			if (mRepeatInterval % 60 == 0)
 				return i18n("1 Hour", "%n Hours", mRepeatInterval/60);
 			TQString mins;
-			return i18n("Hours and Minutes", "%1H %2M").arg(TQString::number(mRepeatInterval/60)).arg(mins.sprintf("%02d", mRepeatInterval%60));
+			return i18n("Hours and Minutes", "%1H %2M").tqarg(TQString::number(mRepeatInterval/60)).tqarg(mins.sprintf("%02d", mRepeatInterval%60));
 		}
 		if (mRepeatInterval % (7*1440))
 			return i18n("1 Day", "%n Days", mRepeatInterval/1440);
@@ -2844,7 +2844,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 					Alarm* alarm = *alit;
 					if (alarm->type() == Alarm::Display)
 						alarm->setCustomProperty(APPNAME, FONT_COLOUR_PROPERTY,
-						                         TQString::tqfromLatin1("%1;;").arg(cats[0]));
+						                         TQString::tqfromLatin1("%1;;").tqarg(cats[0]));
 				}
 				cats.remove(cats.begin());
 			}
@@ -2918,7 +2918,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			while ((it = cats.tqfind(TEMPL_DEF_TIME_CAT)) != cats.end())
 			{
 				cats.remove(it);
-				cats.append(TQString("%1%2").arg(TEMPL_AFTER_TIME_CATEGORY).arg(0));
+				cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(0));
 			}
 		}
 
@@ -2937,7 +2937,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 		}
 
 		if (addLateCancel)
-			cats.append(TQString("%1%2").arg(LATE_CANCEL_CATEGORY).arg(1));
+			cats.append(TQString("%1%2").tqarg(LATE_CANCEL_CATEGORY).tqarg(1));
 
 		event->setCategories(cats);
 
@@ -3321,11 +3321,11 @@ void KAAlarmEventBase::dumpDebug() const
 		kdDebug(5950) << "--         Attachments:" << mEmailAttachments.join(", ") << ":\n";
 		kdDebug(5950) << "--         Bcc:" << (mEmailBcc ? "true" : "false") << ":\n";
 	}
-	kdDebug(5950) << "-- mBgColour:" << mBgColour.name() << ":\n";
-	kdDebug(5950) << "-- mFgColour:" << mFgColour.name() << ":\n";
+	kdDebug(5950) << "-- mBgColour:" << TQString(mBgColour.name()) << ":\n";
+	kdDebug(5950) << "-- mFgColour:" << TQString(mFgColour.name()) << ":\n";
 	kdDebug(5950) << "-- mDefaultFont:" << (mDefaultFont ? "true" : "false") << ":\n";
 	if (!mDefaultFont)
-		kdDebug(5950) << "-- mFont:" << mFont.toString() << ":\n";
+		kdDebug(5950) << "-- mFont:" << TQString(mFont.toString()) << ":\n";
 	kdDebug(5950) << "-- mBeep:" << (mBeep ? "true" : "false") << ":\n";
 	kdDebug(5950) << "-- mSpeak:" << (mSpeak ? "true" : "false") << ":\n";
 	if (mActionType == T_AUDIO)