From 0e00c0a86a4c9d7e80c7b66d91940cc7dcb79f78 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:34:45 -0600 Subject: Rename old tq methods that no longer need a unique name --- karm/timekard.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'karm/timekard.cpp') diff --git a/karm/timekard.cpp b/karm/timekard.cpp index d9b8d4a76..6ac410a26 100644 --- a/karm/timekard.cpp +++ b/karm/timekard.cpp @@ -43,7 +43,7 @@ const int timeWidth = 6; const int totalTimeWidth = 7; const int reportWidth = taskWidth + timeWidth; -const TQString cr = TQString::tqfromLatin1("\n"); +const TQString cr = TQString::fromLatin1("\n"); TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime which) // Print the total Times as text. If justThisTask, use activeTask, else, all tasks @@ -59,9 +59,9 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // header retval += i18n("Task Totals") + cr; - retval += KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime()); + retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()); retval += cr + cr; - retval += TQString(TQString::tqfromLatin1("%1 %2")) + retval += TQString(TQString::fromLatin1("%1 %2")) .tqarg(i18n("Time"), timeWidth) .tqarg(i18n("Task")); retval += cr; @@ -92,8 +92,8 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime // total buf.fill('-', reportWidth); - retval += TQString(TQString::tqfromLatin1("%1")).tqarg(buf, timeWidth) + cr; - retval += TQString(TQString::tqfromLatin1("%1 %2")) + retval += TQString(TQString::fromLatin1("%1")).tqarg(buf, timeWidth) + cr; + retval += TQString(TQString::fromLatin1("%1 %2")) .tqarg(formatTime(sum),timeWidth) .tqarg(i18n("Total")); } @@ -109,7 +109,7 @@ void TimeKard::printTask(Task *task, TQString &s, int level, WhichTime which) TQString buf; s += buf.fill(' ', level); - s += TQString(TQString::tqfromLatin1("%1 %2")) + s += TQString(TQString::fromLatin1("%1 %2")) .tqarg(formatTime(which == TotalTime?task->totalTime():task->totalSessionTime()), timeWidth) .tqarg(task->name()); s += cr; @@ -134,8 +134,8 @@ void TimeKard::printTaskHistory(const Task *task, long sectionsum = 0; for ( TQDate day = from; day <= to; day = day.addDays(1) ) { - TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); - TQString daytaskkey = TQString::tqfromLatin1("%1_%2") + TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::fromLatin1("%1_%2") .tqarg(daykey) .tqarg(task->uid()); @@ -143,7 +143,7 @@ void TimeKard::printTaskHistory(const Task *task, { if ( !totalsOnly ) { - s += TQString::tqfromLatin1("%1") + s += TQString::fromLatin1("%1") .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").tqarg(formatTime(sectionsum/60), totalTimeWidth); + s += TQString::fromLatin1("%1").tqarg(formatTime(sectionsum/60), totalTimeWidth); // Task name TQString buf; s += buf.fill(' ', level + 1); - s += TQString::tqfromLatin1("%1").tqarg(task->name()); + s += TQString::fromLatin1("%1").tqarg(task->name()); s += cr; for (Task* subTask = task->firstChild(); @@ -221,8 +221,8 @@ TQString TimeKard::sectionHistoryAsText( // so times are accumulated for each task. for (TQValueList::iterator event = events.begin(); event != events.end(); ++event) { - TQString daykey = (*event).start().date().toString(TQString::tqfromLatin1("yyyyMMdd")); - TQString daytaskkey = TQString::tqfromLatin1("%1_%2") + TQString daykey = (*event).start().date().toString(TQString::fromLatin1("yyyyMMdd")); + TQString daytaskkey = TQString::fromLatin1("%1_%2") .tqarg(daykey) .tqarg((*event).todoUid()); @@ -246,7 +246,7 @@ TQString TimeKard::sectionHistoryAsText( // day headings for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - retval += TQString::tqfromLatin1("%1").tqarg(day.day(), timeWidth); + retval += TQString::fromLatin1("%1").tqarg(day.day(), timeWidth); } retval += cr; retval += line; @@ -280,13 +280,13 @@ TQString TimeKard::sectionHistoryAsText( long sum = 0; for (TQDate day = sectionFrom; day <= sectionTo; day = day.addDays(1)) { - TQString daykey = day.toString(TQString::tqfromLatin1("yyyyMMdd")); + TQString daykey = day.toString(TQString::fromLatin1("yyyyMMdd")); if (daytotals.contains(daykey)) { if ( !totalsOnly ) { - retval += TQString::tqfromLatin1("%1") + retval += TQString::fromLatin1("%1") .tqarg(formatTime(daytotals[daykey]/60), timeWidth); } sum += daytotals[daykey]; // in seconds @@ -298,7 +298,7 @@ TQString TimeKard::sectionHistoryAsText( } } - retval += TQString::tqfromLatin1("%1 %2") + retval += TQString::fromLatin1("%1 %2") .tqarg(formatTime(sum/60), totalTimeWidth) .tqarg(i18n("Total")); } @@ -317,7 +317,7 @@ TQString TimeKard::historyAsText(TaskView* taskview, const TQDate& from, .tqarg(KGlobal::locale()->formatDate(to)); retval += cr; retval += i18n("Printed on: %1") - .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::tqcurrentDateTime())); + .tqarg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime())); if ( perWeek ) { -- cgit v1.2.1