From e4718919724243fced20148062f71ce8818d6bb5 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 23:43:22 +0000 Subject: Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q* This fixes the Kopete MSN protocol among other things git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmyfirewall@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmyfirewall/core/iptchain.cpp | 2 +- kmyfirewall/core/iptrule.cpp | 4 ++-- kmyfirewall/kmfwidgets/kmflistview.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/kmyfirewall/core/iptchain.cpp b/kmyfirewall/core/iptchain.cpp index c712b6e..14c4f1c 100644 --- a/kmyfirewall/core/iptchain.cpp +++ b/kmyfirewall/core/iptchain.cpp @@ -248,7 +248,7 @@ TQPtrList& IPTChain::chainFwds() { // FIXME: lots of targets missing !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! if ( !target.isEmpty() && target != "ACCEPT" && target != "DROP" && target != "LOG" && target != "REJECT" && target != "RETURN" && target != "DNAT" && target != "SNAT" - && target != "TQUEUE" && target != "MIRROR" && target != "REDIRECT" && target != "MASTQUERADE" ) { + && target != "QUEUE" && target != "MIRROR" && target != "REDIRECT" && target != "MASTQUERADE" ) { //kdDebug() << "Found Forward to chain: " << target << endl; fwds->append( rule ); } diff --git a/kmyfirewall/core/iptrule.cpp b/kmyfirewall/core/iptrule.cpp index 920eb18..c7cc99a 100644 --- a/kmyfirewall/core/iptrule.cpp +++ b/kmyfirewall/core/iptrule.cpp @@ -141,7 +141,7 @@ const TQString& IPTRule::target() const { bool IPTRule::isForward() const { //FIXME: Is that sematically correct??? if ( m_target == "ACCEPT" || m_target == "DROP" || - m_target == "LOG" || m_target == "TQUEUE" || + m_target == "LOG" || m_target == "QUEUE" || m_target == "RETURN" || m_target == "REJECT" || m_target == "MIRROR" || m_target == "SNAT" || m_target == "DNAT" || m_target == "REDIRECT" || @@ -163,7 +163,7 @@ TQStringList IPTRule::availableTargets() const { return *( new TQStringList() ); } // general Targets - targets << "ACCEPT" << "DROP" << "LOG" << "TQUEUE" << "RETURN"; + targets << "ACCEPT" << "DROP" << "LOG" << "QUEUE" << "RETURN"; if ( name == Constants::InputChain_Name || name == Constants::OutputChain_Name || name == Constants::ForwardChain_Name ) targets << "REJECT"; diff --git a/kmyfirewall/kmfwidgets/kmflistview.cpp b/kmyfirewall/kmfwidgets/kmflistview.cpp index bee3ea1..f29f88a 100644 --- a/kmyfirewall/kmfwidgets/kmflistview.cpp +++ b/kmyfirewall/kmfwidgets/kmflistview.cpp @@ -771,7 +771,7 @@ void KMFListView::setupRuleView( IPTRule* rule, KMFListViewItem* parent ) { item_target->setPixmap( 1, icon_reject ); } else if ( rule_target == "RETURN" ) { item_target->setPixmap( 1, icon_return ); - } else if ( rule_target == "TQUEUE" ) { + } else if ( rule_target == "QUEUE" ) { item_target->setPixmap( 1, icon_queue ); } -- cgit v1.2.3