diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /libtdeedu/extdate/extdatetime.cpp | |
parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'libtdeedu/extdate/extdatetime.cpp')
-rw-r--r-- | libtdeedu/extdate/extdatetime.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |