diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:50:20 -0600 |
| commit | aef5eada7f51ee48f3d21448db290bd8f06953a8 (patch) | |
| tree | 9d6e7572ebcc27e402501d6966f9b46361a1702c /khexedit/lib/codecs/ktextcharcodec.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/codecs/ktextcharcodec.cpp')
| -rw-r--r-- | khexedit/lib/codecs/ktextcharcodec.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/khexedit/lib/codecs/ktextcharcodec.cpp b/khexedit/lib/codecs/ktextcharcodec.cpp index b45c76d..6b27670 100644 --- a/khexedit/lib/codecs/ktextcharcodec.cpp +++ b/khexedit/lib/codecs/ktextcharcodec.cpp @@ -79,7 +79,7 @@ static bool is8Bit( TQTextCodec *Codec ) static TQTextCodec *createLatin1() { - return KGlobal::charsets()->codecForName( EncodingNames[0].Name ); + return TDEGlobal::charsets()->codecForName( EncodingNames[0].Name ); } /** heuristic seems to be doomed :( @@ -120,12 +120,12 @@ const TQStringList &KTextCharCodec::codecNames() // first call? if( CodecNames.isEmpty() ) { - const TQStringList &CharSets = KGlobal::charsets()->availableEncodingNames(); + const TQStringList &CharSets = TDEGlobal::charsets()->availableEncodingNames(); for( TQStringList::ConstIterator it = CharSets.begin(); it != CharSets.end(); ++it ) { bool Found = true; - TQTextCodec* Codec = KGlobal::charsets()->codecForName( *it, Found ); + TQTextCodec* Codec = TDEGlobal::charsets()->codecForName( *it, Found ); if( Found && is8Bit(Codec) ) CodecNames.append( TQString::fromLatin1(Codec->name()) ); } @@ -161,7 +161,7 @@ TQStringList KTextCharCodec::CodecNames; KTextCharCodec *KTextCharCodec::createLocalCodec() { - TQTextCodec *Codec = KGlobal::locale()->codecForEncoding(); + TQTextCodec *Codec = TDEGlobal::locale()->codecForEncoding(); if( !is8Bit(Codec) ) Codec = createLatin1(); return new KTextCharCodec( Codec ); @@ -171,7 +171,7 @@ KTextCharCodec *KTextCharCodec::createLocalCodec() KTextCharCodec *KTextCharCodec::createCodec( const TQString &CodeName ) { bool Ok; - TQTextCodec *Codec = KGlobal::charsets()->codecForName( CodeName, Ok ); + TQTextCodec *Codec = TDEGlobal::charsets()->codecForName( CodeName, Ok ); if( Ok ) Ok = is8Bit( Codec ); return Ok ? new KTextCharCodec( Codec ) : 0; @@ -187,7 +187,7 @@ const TQStringList &KTextCharCodec::codecNames() { bool Found = true; TQString Name = TQString::fromLatin1( EncodingNames[i].Name ); - TQTextCodec* Codec = KGlobal::charsets()->codecForName( Name, Found ); + TQTextCodec* Codec = TDEGlobal::charsets()->codecForName( Name, Found ); if( Found ) CodecNames.append( TQString::fromLatin1(Codec->name()) ); } |