diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 13:48:31 -0600 |
| commit | c48e769eb275917717e2b55eb869f7e559293ac8 (patch) | |
| tree | 8f650b907e21c918b826f854dbe1c8174cc2c0c6 /kopete/protocols/irc/kcodecaction.cpp | |
| parent | 8011d84f483f3628f3f04ea5cb2c1c3c86b2dba7 (diff) | |
| download | tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.tar.gz tdenetwork-c48e769eb275917717e2b55eb869f7e559293ac8.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/irc/kcodecaction.cpp')
| -rw-r--r-- | kopete/protocols/irc/kcodecaction.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp index 5dca8771..97964885 100644 --- a/kopete/protocols/irc/kcodecaction.cpp +++ b/kopete/protocols/irc/kcodecaction.cpp @@ -34,9 +34,9 @@ void KCodecAction::slotActivated( const TQString & text ) /* text is something like "Western European ( iso-8859-1 )", but we must give * codecForName() only the "iso-8859-1" part. */ - TQString encoding = KGlobal::charsets()->encodingForName(text); + TQString encoding = TDEGlobal::charsets()->encodingForName(text); - emit activated( KGlobal::charsets()->codecForName(encoding) ); + emit activated( TDEGlobal::charsets()->codecForName(encoding) ); } void KCodecAction::setCodec( const TQTextCodec *codec ) @@ -44,9 +44,9 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList items = this->items(); int i = 0; for (TQStringList::ConstIterator it = items.begin(), end = items.end(); it != end; ++it, ++i) { - TQString encoding = KGlobal::charsets()->encodingForName(*it); + TQString encoding = TDEGlobal::charsets()->encodingForName(*it); - if (KGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { + if (TDEGlobal::charsets()->codecForName(encoding)->mibEnum() == codec->mibEnum()) { setCurrentItem(i); break; } @@ -61,25 +61,25 @@ void KCodecAction::setCodec( const TQTextCodec *codec ) TQStringList KCodecAction::supportedEncodings(bool usAscii) { - TQStringList encodingNames = KGlobal::charsets()->availableEncodingNames(); + TQStringList encodingNames = TDEGlobal::charsets()->availableEncodingNames(); TQStringList encodings; TQMap<TQString, bool> mimeNames; for (TQStringList::ConstIterator it = encodingNames.begin(); it != encodingNames.end(); ++it) { - TQTextCodec *codec = KGlobal::charsets()->codecForName(*it); + TQTextCodec *codec = TDEGlobal::charsets()->codecForName(*it); TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it); if (mimeNames.find(mimeName) == mimeNames.end()) { - encodings.append(KGlobal::charsets()->languageForEncoding(*it) + encodings.append(TDEGlobal::charsets()->languageForEncoding(*it) + " ( " + mimeName + " )"); mimeNames.insert(mimeName, true); } } encodings.sort(); - if (usAscii) encodings.prepend(KGlobal::charsets() + if (usAscii) encodings.prepend(TDEGlobal::charsets() ->languageForEncoding("us-ascii") + " ( us-ascii )"); return encodings; } |