diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:47:22 -0600 |
| commit | 28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch) | |
| tree | 7b7a01768b3781763186c825af21bb14717d2c32 /interfaces/ktexteditor | |
| parent | 07c48c43ff72c237e4028154f4594102b798073f (diff) | |
| download | tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'interfaces/ktexteditor')
| -rw-r--r-- | interfaces/ktexteditor/templateinterface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/interfaces/ktexteditor/templateinterface.cpp b/interfaces/ktexteditor/templateinterface.cpp index 894d23f6a..ecc34c7e2 100644 --- a/interfaces/ktexteditor/templateinterface.cpp +++ b/interfaces/ktexteditor/templateinterface.cpp @@ -113,23 +113,23 @@ bool TemplateInterface::expandMacros( TQMap<TQString, TQString> &map, TQWidget * } else if ( placeholder == "date" ) { - map[ placeholder ] = KGlobal::locale() ->formatDate( date, true ); + map[ placeholder ] = TDEGlobal::locale() ->formatDate( date, true ); } else if ( placeholder == "time" ) { - map[ placeholder ] = KGlobal::locale() ->formatTime( time, true, false ); + map[ placeholder ] = TDEGlobal::locale() ->formatTime( time, true, false ); } else if ( placeholder == "year" ) { - map[ placeholder ] = KGlobal::locale() ->calendar() ->yearString( date, false ); + map[ placeholder ] = TDEGlobal::locale() ->calendar() ->yearString( date, false ); } else if ( placeholder == "month" ) { - map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->month( date ) ); + map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->month( date ) ); } else if ( placeholder == "day" ) { - map[ placeholder ] = TQString::number( KGlobal::locale() ->calendar() ->day( date ) ); + map[ placeholder ] = TQString::number( TDEGlobal::locale() ->calendar() ->day( date ) ); } else if ( placeholder == "hostname" ) { |