From cee429821aa6f1acc97fb482d325fb4eb37376ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:44:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- libtdeedu/extdate/extdatetime.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libtdeedu/extdate/extdatetime.cpp') diff --git a/libtdeedu/extdate/extdatetime.cpp b/libtdeedu/extdate/extdatetime.cpp index 681db123..3efcfdbd 100644 --- a/libtdeedu/extdate/extdatetime.cpp +++ b/libtdeedu/extdate/extdatetime.cpp @@ -258,7 +258,7 @@ TQString ExtDate::toString( Qt::DateFormat f) const break; case Qt::LocalDate : // local settings - a_format = KGlobal::locale()->dateFormat(); + a_format = TDEGlobal::locale()->dateFormat(); break; default : @@ -803,8 +803,8 @@ TQString ExtDateTime::toString( Qt::DateFormat f ) const } #endif else if ( f == Qt::LocalDate ) { - return toString( KGlobal::locale()->dateFormat() - + " " + KGlobal::locale()->timeFormat() ); + return toString( TDEGlobal::locale()->dateFormat() + + " " + TDEGlobal::locale()->timeFormat() ); } return TQString(); -- cgit v1.2.3