summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/irc/kcodecaction.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-22 00:30:31 +0000
commit69cac65817d949cda2672ec4f0aa73d5e66a0ba1 (patch)
tree073fde0496ea90eb5bf5cffe66a8da43a9f55fbc /kopete/protocols/irc/kcodecaction.cpp
parent3467e6464beac3a162839bf7078e22e3a74d73e7 (diff)
downloadtdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.tar.gz
tdenetwork-69cac65817d949cda2672ec4f0aa73d5e66a0ba1.zip
TQt4 port kdenetwork
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kopete/protocols/irc/kcodecaction.cpp')
-rw-r--r--kopete/protocols/irc/kcodecaction.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/irc/kcodecaction.cpp b/kopete/protocols/irc/kcodecaction.cpp
index f7e4ee24..7bd9bfe8 100644
--- a/kopete/protocols/irc/kcodecaction.cpp
+++ b/kopete/protocols/irc/kcodecaction.cpp
@@ -21,7 +21,7 @@
#include "kcodecaction.h"
KCodecAction::KCodecAction( const TQString &text, const KShortcut &cut,
- TQObject *parent, const char *name ) : KSelectAction( text, "", cut, parent, name )
+ TQObject *tqparent, const char *name ) : KSelectAction( text, "", cut, tqparent, name )
{
TQObject::connect( this, TQT_SIGNAL( activated( const TQString & ) ),
this, TQT_SLOT( slotActivated( const TQString & ) ) );
@@ -70,7 +70,7 @@ TQStringList KCodecAction::supportedEncodings(bool usAscii)
{
TQTextCodec *codec = KGlobal::charsets()->codecForName(*it);
TQString mimeName = (codec) ? TQString(codec->mimeName()).lower() : (*it);
- if (mimeNames.find(mimeName) == mimeNames.end())
+ if (mimeNames.tqfind(mimeName) == mimeNames.end())
{
encodings.append(KGlobal::charsets()->languageForEncoding(*it)
+ " ( " + mimeName + " )");