diff options
Diffstat (limited to 'khexedit/lib')
-rw-r--r-- | khexedit/lib/codecs/ktextcharcodec.cpp | 12 | ||||
-rw-r--r-- | khexedit/lib/kbufferdrag.cpp | 4 | ||||
-rw-r--r-- | khexedit/lib/khexedit.cpp | 2 |
3 files changed, 9 insertions, 9 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()) ); } 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(); } diff --git a/khexedit/lib/khexedit.cpp b/khexedit/lib/khexedit.cpp index 2a833d6..6a7c433 100644 --- a/khexedit/lib/khexedit.cpp +++ b/khexedit/lib/khexedit.cpp @@ -128,7 +128,7 @@ KHexEdit::KHexEdit( KDataBuffer *Buffer, TQWidget *Parent, const char *Name, WFl FixedFont.setFixedPitch( true ); setFont( FixedFont ); #else - setFont( KGlobalSettings::fixedFont() ); + setFont( TDEGlobalSettings::fixedFont() ); #endif // get the full control |