From 1c93fca14d9ce37499bcfdf994c660186a0b6f17 Mon Sep 17 00:00:00 2001 From: tpearson 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 --- karm/timekard.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'karm/timekard.cpp') diff --git a/karm/timekard.cpp b/karm/timekard.cpp index d7de48402..c50168574 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -62,8 +62,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); retval += cr + cr; retval += TQString(TQString::tqfromLatin1("%1 %2")) - .arg(i18n("Time"), timeWidth) - .arg(i18n("Task")); + .tqarg(i18n("Time"), timeWidth) + .tqarg(i18n("Task")); retval += cr; retval += line; @@ -92,10 +92,10 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // total buf.fill('-', reportWidth); - retval += TQString(TQString::tqfromLatin1("%1")).arg(buf, timeWidth) + cr; + retval += TQString(TQString::tqfromLatin1("%1")).tqarg(buf, timeWidth) + cr; retval += TQString(TQString::tqfromLatin1("%1 %2")) - .arg(formatTime(sum),timeWidth) - .arg(i18n("Total")); + .tqarg(formatTime(sum),timeWidth) + .tqarg(i18n("Total")); } else retval += i18n("No tasks."); @@ -110,8 +110,8 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which) s += buf.fill(' ', level); s += TQString(TQString::tqfromLatin1("%1 %2")) - .arg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) - .arg(task->name()); + .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) + .tqarg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -136,15 +136,15 @@ void TimeKard::printTaskHistory(const Task *task, { TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); TQString daytaskkey = TQString::tqfromLatin1("%1_%2") - .arg(daykey) - .arg(task->uid()); + .tqarg(daykey) + .tqarg(task->uid()); if (taskdaytotals.tqcontains(daytaskkey)) { if ( !totalsOnly ) { s += TQString::tqfromLatin1("%1") - .arg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); + .tqarg(formatTime(taskdaytotals[daytaskkey]/60), timeWidth); } sectionsum += taskdaytotals[daytaskkey]; // in seconds @@ -162,12 +162,12 @@ void TimeKard::printTaskHistory(const Task *task, } // Total for task this section (e.g. week) - s += TQString::tqfromLatin1("%1").arg(formatTime(sectionsum/60), totalTimeWidth); + s += TQString::tqfromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth); // Task name TQString buf; s += buf.fill(' ', level + 1); - s += TQString::tqfromLatin1("%1").arg(task->name()); + s += TQString::tqfromLatin1("%1").tqarg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -223,8 +223,8 @@ TQString TimeKard::sectionHistoryAsText( { TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd")); TQString daytaskkey = TQString::tqfromLatin1("%1_%2") - .arg(daykey) - .arg((*event).todoUid()); + .tqarg(daykey) + .tqarg((*event).todoUid()); if (taskdaytotals.tqcontains(daytaskkey)) taskdaytotals.tqreplace(daytaskkey, @@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText( // day headings for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - retval += TQString::tqfromLatin1("%1").arg(day.day(), timeWidth); + retval += TQString::tqfromLatin1("%1").tqarg(day.day(), timeWidth); } retval += cr; retval += line; @@ -287,7 +287,7 @@ TQString TimeKard::sectionHistoryAsText( if ( !totalsOnly ) { retval += TQString::tqfromLatin1("%1") - .arg(formatTime(daytotals[daykey]/60), timeWidth); + .tqarg(formatTime(daytotals[daykey]/60), timeWidth); } sum += daytotals[daykey]; // in seconds } @@ -299,8 +299,8 @@ TQString TimeKard::sectionHistoryAsText( } retval += TQString::tqfromLatin1("%1 %2") - .arg(formatTime(sum/60), totalTimeWidth) - .arg(i18n("Total")); + .tqarg(formatTime(sum/60), totalTimeWidth) + .tqarg(i18n("Total")); } return retval; } @@ -313,11 +313,11 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, retval += totalsOnly ? i18n("Task Totals") : i18n("Task History"); retval += cr; retval += i18n("From %1 to %2") - .arg(KGlobal::locale()->formatDate(from)) - .arg(KGlobal::locale()->formatDate(to)); + .tqarg(KGlobal::locale()->formatDate(from)) + .tqarg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .arg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); + .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); if ( perWeek ) { @@ -353,7 +353,7 @@ TQDate Week::end() const TQString Week::name() const { - return i18n("Week of %1").arg(KGlobal::locale()->formatDate(start())); + return i18n("Week of %1").tqarg(KGlobal::locale()->formatDate(start())); } TQValueList Week::weeksFromDateRange(const TQDate& from, const TQDate& to) -- cgit v1.2.1