summaryrefslogtreecommitdiffstats
path: root/karm/timekard.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:49:30 -0600
commita9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch)
treed087071b1e8fcf79698938efec19f8e48bab0799 /karm/timekard.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'karm/timekard.cpp')
-rw-r--r--karm/timekard.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/karm/timekard.cpp b/karm/timekard.cpp
index 984baf741..1be72b961 100644
--- a/karm/timekard.cpp
+++ b/karm/timekard.cpp
@@ -59,7 +59,7 @@ TQString TimeKard::totalsAsText(TaskView* taskview, bool justThisTask, WhichTime
// header
retval += i18n("Task Totals") + cr;
- retval += KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
+ retval += TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime());
retval += cr + cr;
retval += TQString(TQString::fromLatin1("%1 %2"))
.arg(i18n("Time"), timeWidth)
@@ -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));
+ .arg(TDEGlobal::locale()->formatDate(from))
+ .arg(TDEGlobal::locale()->formatDate(to));
retval += cr;
retval += i18n("Printed on: %1")
- .arg(KGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
+ .arg(TDEGlobal::locale()->formatDateTime(TQDateTime::currentDateTime()));
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").arg(TDEGlobal::locale()->formatDate(start()));
}
TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to)
@@ -372,7 +372,7 @@ TQValueList<Week> Week::weeksFromDateRange(const TQDate& from, const TQDate& to)
// even if from and to are the same date. The week starts on the day
// that is set in the locale settings.
start = from.addDays(
- -((7 - KGlobal::locale()->weekStartDay() + from.dayOfWeek()) % 7));
+ -((7 - TDEGlobal::locale()->weekStartDay() + from.dayOfWeek()) % 7));
for (TQDate d = start; d <= to; d = d.addDays(7))
weeks.append(Week(d));