diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:50:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:50:20 -0600 |
| commit | aef5eada7f51ee48f3d21448db290bd8f06953a8 (patch) | |
| tree | 9d6e7572ebcc27e402501d6966f9b46361a1702c /khexedit/lib/kbufferdrag.cpp | |
| parent | 95d05392f9bc01594738a1e06ebf23123b3d3e6e (diff) | |
| download | tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.tar.gz tdeutils-aef5eada7f51ee48f3d21448db290bd8f06953a8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'khexedit/lib/kbufferdrag.cpp')
| -rw-r--r-- | khexedit/lib/kbufferdrag.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/khexedit/lib/kbufferdrag.cpp b/khexedit/lib/kbufferdrag.cpp index 35fbbca..54b776e 100644 --- a/khexedit/lib/kbufferdrag.cpp +++ b/khexedit/lib/kbufferdrag.cpp @@ -47,7 +47,7 @@ static const char *localTextPlain() if( TextPlainLocal.isNull() ) { - TextPlainLocal = TQCString(KGlobal::locale()->encoding()).lower(); + TextPlainLocal = TQCString(TDEGlobal::locale()->encoding()).lower(); // remove the whitespaces int s; while( (s=TextPlainLocal.find(' ')) >= 0 ) @@ -74,7 +74,7 @@ static TQTextCodec* codecForCharset( const TQCString& Desc ) return TQTextCodec::codecForName( CharSetName ); } // no charset=, use locale - return KGlobal::locale()->codecForEncoding(); + return TDEGlobal::locale()->codecForEncoding(); } |