summaryrefslogtreecommitdiffstats
path: root/korganizer/kowhatsnextview.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/kowhatsnextview.cpp
parent5c4a80ead2b1fe57dc6a8c29d0368792344cd61e (diff)
downloadtdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.tar.gz
tdepim-a9bde819f2b421dcc44741156e75eca4bb5fb4f4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/kowhatsnextview.cpp')
-rw-r--r--korganizer/kowhatsnextview.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 6287890c8..14bae60c1 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -65,7 +65,7 @@ KOWhatsNextView::KOWhatsNextView(Calendar *calendar, TQWidget *parent,
: KOrg::BaseView(calendar, parent, name)
{
// TQLabel *dateLabel =
-// new TQLabel(KGlobal::locale()->formatDate(TQDate::currentDate()),this);
+// new TQLabel(TDEGlobal::locale()->formatDate(TQDate::currentDate()),this);
// dateLabel->setMargin(2);
// dateLabel->setAlignment(AlignCenter);
@@ -103,11 +103,11 @@ void KOWhatsNextView::updateView()
mText += "<h2>";
if ( mStartDate.daysTo( mEndDate ) < 1 ) {
- mText += KGlobal::locale()->formatDate( mStartDate );
+ mText += TDEGlobal::locale()->formatDate( mStartDate );
} else {
mText += i18n("Date from - to", "%1 - %2")
- .arg( KGlobal::locale()->formatDate( mStartDate ) )
- .arg( KGlobal::locale()->formatDate( mEndDate ) );
+ .arg( TDEGlobal::locale()->formatDate( mStartDate ) )
+ .arg( TDEGlobal::locale()->formatDate( mEndDate ) );
}
mText+="</h2>\n";
@@ -281,14 +281,14 @@ void KOWhatsNextView::appendEvent( Incidence *ev, const TQDateTime &start,
if ( starttime.date().daysTo( endtime.date() ) >= 1 ) {
mText += i18n("date from - to", "%1 - %2")
- .arg( KGlobal::locale()->formatDateTime( starttime ) )
- .arg( KGlobal::locale()->formatDateTime( endtime ) );
+ .arg( TDEGlobal::locale()->formatDateTime( starttime ) )
+ .arg( TDEGlobal::locale()->formatDateTime( endtime ) );
} else {
/*if (reply) */
mText += i18n("date, from - to", "%1, %2 - %3")
- .arg( KGlobal::locale()->formatDate( starttime.date(), true ) )
- .arg( KGlobal::locale()->formatTime( starttime.time() ) )
- .arg( KGlobal::locale()->formatTime( endtime.time() ) );
+ .arg( TDEGlobal::locale()->formatDate( starttime.date(), true ) )
+ .arg( TDEGlobal::locale()->formatTime( starttime.time() ) )
+ .arg( TDEGlobal::locale()->formatTime( endtime.time() ) );
}
}
// }