diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:49:30 -0600 |
| commit | a9bde819f2b421dcc44741156e75eca4bb5fb4f4 (patch) | |
| tree | d087071b1e8fcf79698938efec19f8e48bab0799 /korganizer/koagendaitem.cpp | |
| parent | 5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff) | |
| download | tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/koagendaitem.cpp')
| -rw-r--r-- | korganizer/koagendaitem.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp index f11ea8c01..216f1dfd8 100644 --- a/korganizer/koagendaitem.cpp +++ b/korganizer/koagendaitem.cpp @@ -836,17 +836,17 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) TQString shortH; TQString longH; if ( !isMultiItem() ) { - shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time()); + shortH = TDEGlobal::locale()->formatTime(mIncidence->dtStart().time()); if (mIncidence->type() != "Todo") longH = i18n("%1 - %2").arg(shortH) - .arg(KGlobal::locale()->formatTime(mIncidence->dtEnd().time())); + .arg(TDEGlobal::locale()->formatTime(mIncidence->dtEnd().time())); else longH = shortH; } else if ( !mMultiItemInfo->mFirstMultiItem ) { - shortH = KGlobal::locale()->formatTime(mIncidence->dtStart().time()); + shortH = TDEGlobal::locale()->formatTime(mIncidence->dtStart().time()); longH = shortH; } else { - shortH = KGlobal::locale()->formatTime(mIncidence->dtEnd().time()); + shortH = TDEGlobal::locale()->formatTime(mIncidence->dtEnd().time()); longH = i18n("- %1").arg(shortH); } @@ -937,8 +937,8 @@ void KOAgendaItem::paintEvent( TQPaintEvent *ev ) (mIncidence->dtStart() != mIncidence->dtEnd()) ) { // multi days shortH = longH = i18n("%1 - %2") - .arg(KGlobal::locale()->formatDate(mIncidence->dtStart().date())) - .arg(KGlobal::locale()->formatDate(mIncidence->dtEnd().date())); + .arg(TDEGlobal::locale()->formatDate(mIncidence->dtStart().date())) + .arg(TDEGlobal::locale()->formatDate(mIncidence->dtEnd().date())); // paint headline p.fillRect( 0, 0, width(), (ft/2) + margin + hlHeight, |