summaryrefslogtreecommitdiffstats
path: root/korganizer/timelabels.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 /korganizer/timelabels.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/timelabels.cpp')
-rw-r--r--korganizer/timelabels.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/korganizer/timelabels.cpp b/korganizer/timelabels.cpp
index 38c587289..0d554edd4 100644
--- a/korganizer/timelabels.cpp
+++ b/korganizer/timelabels.cpp
@@ -112,7 +112,7 @@ void TimeLabels::drawContents(TQPainter *p,int cx, int cy, int cw, int ch)
TQFont nFont = font();
p->setFont( font() );
- if (!KGlobal::locale()->use12Clock()) {
+ if (!TDEGlobal::locale()->use12Clock()) {
suffix = "00";
} else
if (cell > 11) suffix = "pm";
@@ -144,7 +144,7 @@ void TimeLabels::drawContents(TQPainter *p,int cx, int cy, int cw, int ch)
p->drawLine( cx, int(y), cw+2, int(y) );
hour.setNum(cell);
// handle 24h and am/pm time formats
- if (KGlobal::locale()->use12Clock()) {
+ if (TDEGlobal::locale()->use12Clock()) {
if (cell == 12) suffix = "pm";
if (cell == 0) hour.setNum(12);
if (cell > 12) hour.setNum(cell - 12);
@@ -185,10 +185,10 @@ void TimeLabels::updateConfig()
setFont(KOPrefs::instance()->mTimeBarFont);
TQString test = "20";
- if ( KGlobal::locale()->use12Clock() )
+ if ( TDEGlobal::locale()->use12Clock() )
test = "12";
mMiniWidth = fontMetrics().width( test );
- if ( KGlobal::locale()->use12Clock() )
+ if ( TDEGlobal::locale()->use12Clock() )
test = "pm";
else {
test = "00";