TDE
/
kmyfirewall
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmyfirewall
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove the tq in front of these incorrectly TQt4-converted methods/data members:

Browse Source 
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmyfirewall@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent ff41949293
commit 764544601a
61 changed files with 113 additions and 113 deletions
Show Stats Download Patch File Download Diff File

2
KMFSysTray/details_designer.ui
Unescape View File

@ -475,7 +475,7 @@
<slot>raiseWidget(int)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
KMFSysTray/mainwidget_designer.ui
Unescape View File

@ -80,7 +80,7 @@
</widget>
</hbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kled.h</includehint>
<includehint>kpushbutton.h</includehint>

12
kmyfirewall/compilers/pf/kmfpfcompiler.cpp
Unescape View File

@ -239,7 +239,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
}
}
m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->tqmaskLength() ) );
m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->maskLength() ) );
TQPtrList<KMFProtocolUsage>& zoneProts = zone->protocols();
TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts );
while ( itZoneProtocols.current() ) {
@ -255,7 +255,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
m_compiledScript.append( " quick inet proto tcp from " );
m_compiledScript.append( zone->address()->toString() );
m_compiledScript.append( "/" );
m_compiledScript.append( TQString::number( zone->tqmaskLength() ) );
m_compiledScript.append( TQString::number( zone->maskLength() ) );
m_compiledScript.append( " to any " );
m_compiledScript.append( " port " );
m_compiledScript.append( getPortList( prot->protocol()->tcpPorts() ) );
@ -269,7 +269,7 @@ void KMFPFCompiler::createIncommingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
m_compiledScript.append( " quick inet proto udp from " );
m_compiledScript.append( zone->address()->toString() );
m_compiledScript.append( "/" );
m_compiledScript.append( TQString::number( zone->tqmaskLength() ) );
m_compiledScript.append( TQString::number( zone->maskLength() ) );
m_compiledScript.append( " to any " );
m_compiledScript.append( " port " );
m_compiledScript.append( getPortList( prot->protocol()->udpPorts() ) );
@ -344,7 +344,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
}
}
m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->tqmaskLength() ) );
m_compiledScript.append( TQString("\n# Settup rules for zone %1 [%2/%3]\n").tqarg( zone->guiName() ).tqarg( zone->address()->toString() ).tqarg( zone->maskLength() ) );
TQPtrList<KMFProtocolUsage>& zoneProts = zone->protocols();
TQPtrListIterator<KMFProtocolUsage> itZoneProtocols ( zoneProts );
while ( itZoneProtocols.current() ) {
@ -360,7 +360,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
m_compiledScript.append( " quick inet proto tcp from " );
m_compiledScript.append( zone->address()->toString() );
m_compiledScript.append( "/" );
m_compiledScript.append( TQString::number( zone->tqmaskLength() ) );
m_compiledScript.append( TQString::number( zone->maskLength() ) );
m_compiledScript.append( " to any " );
m_compiledScript.append( " port " );
m_compiledScript.append( getPortList( prot->protocol()->tcpPorts() ) );
@ -374,7 +374,7 @@ void KMFPFCompiler::createOutgoingACCESSRules( KMFNetZone* zone, KMFGenericDoc*
m_compiledScript.append( " quick inet proto udp from " );
m_compiledScript.append( zone->address()->toString() );
m_compiledScript.append( "/" );
m_compiledScript.append( TQString::number( zone->tqmaskLength() ) );
m_compiledScript.append( TQString::number( zone->maskLength() ) );
m_compiledScript.append( " to any " );
m_compiledScript.append( " port " );
m_compiledScript.append( getPortList( prot->protocol()->udpPorts() ) );

4
kmyfirewall/core/ipaddress.h
Unescape View File

@ -81,7 +81,7 @@ private:
public:
/** Calculates the nettqmask from the tqmask length
e.g. 255.255.255.0 -> 24 */
static IPAddress& calcNetworkMaskFromLength( int tqmaskLen );
static IPAddress& calcNetworkMaskFromLength( int maskLen );
/** Calculates the given nettqmask length to the net tqmask.
e.g. 24 -> 255.255.255.0 */
@ -94,7 +94,7 @@ public:
static bool isValidAddress( IPAddress& );
/** Checks if the the addresses are on the same network. */
static bool hostsOnSameNetwork( IPAddress&, IPAddress&, int tqmaskLen );
static bool hostsOnSameNetwork( IPAddress&, IPAddress&, int maskLen );
/** Checks if the the addresses are on the same network. */
static bool hostsOnSameNetwork( IPAddress&, IPAddress&, IPAddress& tqmask );

2
kmyfirewall/core/kmfnethost.h
Unescape View File

@ -95,7 +95,7 @@ protected slots:
void slotOnProtocolUsageDeleted( TQObject* protocol );
private: // Data
// int m_tqmaskLen;
// int m_maskLen;
TQPtrList<KMFProtocolUsage> m_protocols;
bool m_logIncoming, m_logOutgoing;
TQString m_limitScale;

22
kmyfirewall/core/kmfnetzone.cpp
Unescape View File

@ -70,7 +70,7 @@ KMFNetZone::KMFNetZone( NetfilterObject *tqparent, const char* name, const TQStr
if ( KMFNetZone * zone = dynamic_cast<KMFNetZone*> ( tqparent ) ) {
m_zoneType = NODE;
m_zone = zone;
setZone( *m_zone->address(), m_zone->tqmaskLength() /* , *m_zone->tqmask() */ );
setZone( *m_zone->address(), m_zone->maskLength() /* , *m_zone->tqmask() */ );
} else if ( KMFGenericDoc * doc = dynamic_cast<KMFGenericDoc*> ( tqparent ) ) {
m_zoneType = ROOT;
m_doc = doc;
@ -223,13 +223,13 @@ void KMFNetZone::setMaskLength( int len ){
// kdDebug() << "void KMFNetZone::setMaskLength( int len )" << endl;
if ( len < 0 || len > 32 ) {
kdDebug() << "ERROR: Mask Lengh invalid: " << len << endl;
m_tqmaskLen = -1;
m_maskLen = -1;
return;
}
if ( m_tqmaskLen == len ) {
if ( m_maskLen == len ) {
return;
}
m_tqmaskLen = len;
m_maskLen = len;
changed();
}
@ -391,9 +391,9 @@ bool KMFNetZone::protocolInherited( const TQUuid& uuid ) const {
return m_zone->protocolInherited( uuid );
}
void KMFNetZone::setZone( const IPAddress& from, int tqmaskLen ) {
void KMFNetZone::setZone( const IPAddress& from, int maskLen ) {
m_address->setAddress( from.toString() );
setMaskLength( tqmaskLen );
setMaskLength( maskLen );
changed();
}
@ -532,7 +532,7 @@ TQString KMFNetZone::toString() {
"Zone: " + address()->toString() +
"/%1" +
" name: " + NetfilterObject::name() +
" GUIName: " + guiName() ).tqarg(tqmaskLength()) ;
" GUIName: " + guiName() ).tqarg(maskLength()) ;
return ret;
}
@ -601,12 +601,12 @@ void KMFNetZone::refreshNetworkTree() {
KMFNetZone *thisTry = allZones->at(j);
if ( thisTry != currZone && ! (
( thisTry->address() == currZone->address() ) == IPAddress::ETQUAL &&
thisTry->tqmaskLength() == currZone->tqmaskLength()
thisTry->maskLength() == currZone->maskLength()
) &&
IPAddress::hostsOnSameNetwork( *thisTry->address(), *currZone->address(), thisTry->tqmaskLength() ) ) {
IPAddress::hostsOnSameNetwork( *thisTry->address(), *currZone->address(), thisTry->maskLength() ) ) {
thisTry->placeZoneInZone( currZone );
// allZones->remove( thisTry );
// kdDebug() << "Add Zone: " << currZone->toString() << endl;
@ -646,7 +646,7 @@ void KMFNetZone::refreshNetworkTree() {
KMFTarget *currHost = allHosts->at(i);
for( int j = allZones->count() - 1; allZones->count() > 0 && j >= 0; j-- ) {
KMFNetZone *currZone = allZones->at(j);
if ( IPAddress::hostsOnSameNetwork( *currZone->address(), *currHost->address(), currZone->tqmaskLength() ) ) {
if ( IPAddress::hostsOnSameNetwork( *currZone->address(), *currHost->address(), currZone->maskLength() ) ) {
currZone->placeHostInZone( currHost );
/* kdDebug() << "Add Host: " << currHost->toString() << endl;
kdDebug() << "to Zone : " << currZone->toString() << endl;*/
@ -799,7 +799,7 @@ const TQDomDocument& KMFNetZone::getDOMTree() {
TQDomElement tqmask = doc.createElement( XML::NetMask_Element );
root.appendChild( tqmask );
tqmask.setAttribute( XML::Address_Attribute, tqmaskLength() );
tqmask.setAttribute( XML::Address_Attribute, maskLength() );
TQPtrListIterator<KMFNetZone> it ( m_zones );
while ( it.current() ) {

8
kmyfirewall/core/kmfnetzone.h
Unescape View File

@ -70,12 +70,12 @@ public:
IPAddress* tqmask() const {
IPAddress *addr = new IPAddress();
addr->setAddress( IPAddress::calcNetworkMaskFromLength( m_tqmaskLen ).toString() );
addr->setAddress( IPAddress::calcNetworkMaskFromLength( m_maskLen ).toString() );
return addr;
};
int tqmaskLength() const {
return m_tqmaskLen;
int maskLength() const {
return m_maskLen;
}
KMFGenericDoc* doc() const;
@ -175,7 +175,7 @@ private: // Data
TQPtrList<KMFTarget> m_hosts;
KMFError *m_err;
int m_zoneType;
int m_tqmaskLen;
int m_maskLen;
// bool m_deadEnd;
TQString m_guiName;
bool m_readOnly;

4
kmyfirewall/core/kmfnetzonelist.cpp
Unescape View File

@ -24,9 +24,9 @@ int KMFNetZoneList::compareItems( TQPtrCollection::Item item1, TQPtrCollection::
KMFNetZone* z2 = (KMFNetZone*) item2;
// KMFNetZone* z2 = static_cast<KMFNetZone>( *item2 );
if ( z1->tqmaskLength() > z2->tqmaskLength() ) {
if ( z1->maskLength() > z2->maskLength() ) {
return 1;
} else if ( z1->tqmaskLength() == z2->tqmaskLength() ){
} else if ( z1->maskLength() == z2->maskLength() ){
return 0;
} else {
return -1;

2
kmyfirewall/core/netfilterobject.h
Unescape View File

@ -145,7 +145,7 @@ public:
void changed();
/** Get the Parent object */
NetfilterObject* tqparentObj() const {
NetfilterObject* parentObj() const {
return m_parent;
}

8
kmyfirewall/genericinterface/kmfgenericinterface_part.cpp
Unescape View File

@ -34,13 +34,13 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include "../kmfwidgets/kmfmainwindow.h"
namespace KMF {
KMFGenericInterfacePart::KMFGenericInterfacePart( TQWidget *tqparentWidget, const char * widgetName ,
KMFGenericInterfacePart::KMFGenericInterfacePart( TQWidget *parentWidget, const char * widgetName ,
TQObject *tqparent, const char *name,
const TQStringList & /*args*/ )
: KParts::ReadWritePart( tqparent, name ) {
setInstance( KMFGenericInterfacePartFactory::instance() );
m_genericinterface = new KMFGenericInterface( tqparentWidget, widgetName );
m_genericinterface = new KMFGenericInterface( parentWidget, widgetName );
m_app = dynamic_cast<KMFMainWindow*>( tqparent );
@ -225,11 +225,11 @@ KMFGenericInterfacePartFactory::~KMFGenericInterfacePartFactory() {
s_instance = 0L;
}
KParts::Part* KMFGenericInterfacePartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
KParts::Part* KMFGenericInterfacePartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList& args) {
// Create an instance of our Part
KMFGenericInterfacePart * obj = new KMFGenericInterfacePart( tqparentWidget, widgetName, tqparent, name ,args );
KMFGenericInterfacePart * obj = new KMFGenericInterfacePart( parentWidget, widgetName, tqparent, name ,args );
// See if we are to be read-write or not
if ( TQCString( classname ) == "KParts::ReadOnlyPart" )

4
kmyfirewall/genericinterface/kmfgenericinterface_part.h
Unescape View File

@ -32,7 +32,7 @@ class KMFGenericInterfacePart: public KParts::ReadWritePart {
Q_OBJECT
TQ_OBJECT
public:
KMFGenericInterfacePart( TQWidget *tqparent, const char *name, TQObject *tqparentObject, const
KMFGenericInterfacePart( TQWidget *tqparent, const char *name, TQObject *parentObject, const
char *nameOb,
const TQStringList & /*args*/ );
virtual ~KMFGenericInterfacePart();
@ -98,7 +98,7 @@ class KMFGenericInterfacePartFactory : public KParts::Factory
public:
KMFGenericInterfacePartFactory();
virtual ~KMFGenericInterfacePartFactory();
virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();

4
kmyfirewall/genericinterface/kmfgenericinterfaceprotocol.cpp
Unescape View File

@ -223,7 +223,7 @@ void KMFGenericInterfaceProtocol::slotNewItemSelected( TQListViewItem* item ) {
if ( m_zone ) {
kdDebug() << "kmfitem->zone() pointer is valid" << endl;
kmfitem->setText( 0,m_zone->guiName() );
kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->tqmaskLength() ) );
kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) );
m_protocolLIstView->setZone( m_zone );
m_protocolLIstView->setEnabled( true );
m_network_widget->loadZone( m_zone );
@ -539,7 +539,7 @@ void KMFGenericInterfaceProtocol::slotZoneChanged( KMFNetZone* z ) {
kdDebug() << "void KMFGenericInterfaceProtocol::slotZoneChanged( KMFNetZone* z )" << endl;
if ( KMFListViewItem *item = findItem( z->uuid() ) ) {
kdDebug() << "Updating item" << endl;
item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->tqmaskLength() ) );
item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->maskLength() ) );
}
m_doc->currentDocAsGenericDoc()->incomingZone()->refreshNetworkTree();
m_doc->currentDocAsGenericDoc()->outgoingZone()->refreshNetworkTree();

2
kmyfirewall/genericinterface/kmyfirewallgenericinterfacehostwidget.ui
Unescape View File

@ -293,7 +293,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
kmyfirewall/genericinterface/kmyfirewallgenericinterfaceicmp.ui
Unescape View File

@ -174,5 +174,5 @@ However, there are a lot of network programs that use ping requests to find and
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/genericinterface/kmyfirewallgenericinterfacelogging.ui
Unescape View File

@ -187,7 +187,7 @@ The entries are written to the system's main log file
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>krestrictedline.h</includehint>
</includehints>

2
kmyfirewall/genericinterface/kmyfirewallgenericinterfacenatwidget.ui
Unescape View File

@ -282,7 +282,7 @@ are using your computer a their default gateway.&lt;/p&gt;</string>
<slot>setDisabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
kmyfirewall/genericinterface/kmyfirewallgenericinterfaceprotocolwidget.ui
Unescape View File

@ -208,7 +208,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

10
kmyfirewall/ipteditor/kmfipteditorpart.cpp
Unescape View File

@ -41,7 +41,7 @@ Author: Christian Hubinger <chubinger@irrsinnig.org>, (C) 2001
#include "../core/kmfdoc.h"
#include "../core/kmfiptdoc.h"
namespace KMF {
KMFIPTEditorPart::KMFIPTEditorPart( TQWidget *tqparentWidget, const char *widgetName,
KMFIPTEditorPart::KMFIPTEditorPart( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name )
: KParts::ReadWritePart( tqparent, name ) {
KMFMainWindow *app = 0;
@ -55,11 +55,11 @@ KMFIPTEditorPart::KMFIPTEditorPart( TQWidget *tqparentWidget, const char *widget
}
// this should be your custom internal widget
m_ruleedit = new KMFRuleEdit( tqparentWidget, widgetName );
m_ruleedit = new KMFRuleEdit( parentWidget, widgetName );
m_ruleedit->setKMFMainWindow( app );
m_ruleedit->setFocusPolicy( TQ_ClickFocus );
m_editdoc = new KMFIPTDocOptions( tqparentWidget , "m_editdoc" );
m_editdoc = new KMFIPTDocOptions( parentWidget , "m_editdoc" );
m_editdoc->hide();
m_ruleedit->loadDoc( app->network() );
@ -275,11 +275,11 @@ KMFIPTEditorPartFactory::~KMFIPTEditorPartFactory() {
s_instance = 0L;
}
KParts::Part* KMFIPTEditorPartFactory::createPartObject( TQWidget *tqparentWidget, const char *widgetName,
KParts::Part* KMFIPTEditorPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList& ) {
// Create an instance of our Part
KMFIPTEditorPart * obj = new KMFIPTEditorPart( tqparentWidget, widgetName, tqparent, name );
KMFIPTEditorPart * obj = new KMFIPTEditorPart( parentWidget, widgetName, tqparent, name );
// See if we are to be read-write or not
if ( TQCString( classname ) == "KParts::ReadOnlyPart" )

4
kmyfirewall/ipteditor/kmfipteditorpart.h
Unescape View File

@ -46,7 +46,7 @@ public:
/**
* Default constructor
*/
KMFIPTEditorPart(TQWidget *tqparentWidget, const char *widgetName,
KMFIPTEditorPart(TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name);
/**
@ -112,7 +112,7 @@ class KMFIPTEditorPartFactory : public KParts::Factory
public:
KMFIPTEditorPartFactory();
virtual ~KMFIPTEditorPartFactory();
virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *tqparent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();

2
kmyfirewall/ipteditor/kmyfirewallchaineditor.ui
Unescape View File

@ -886,7 +886,7 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>

2
kmyfirewall/ipteditor/kmyfirewallchaineditornewchain.ui
Unescape View File

@ -259,5 +259,5 @@
<Q_SLOTS>
<slot>slotOk()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/ipteditor/kmyfirewallruleeditor.ui
Unescape View File

@ -743,7 +743,7 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kled.h</includehint>
<includehint>kled.h</includehint>

2
kmyfirewall/kmfwidgets/kmflistviewitem.cpp
Unescape View File

@ -250,7 +250,7 @@ void KMFListViewItem::setupZoneView() {
}
// if ( m_zone->name().startsWith("incoming_world") || m_zone->name().startsWith("outgoing_world") )
setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->tqmaskLength() ) );
setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) );
/* setText( 2,"" + i18n("%1 -> Localhost").tqarg( m_zone->guiName() ) );*/
setText( 4,"" + m_zone->description() );

4
kmyfirewall/kmfwidgets/kmfmynetworkwidget.cpp
Unescape View File

@ -164,7 +164,7 @@ void KMFMyNetworkWidget::slotNewItemSelected( TQListViewItem* item ) {
if ( m_zone ) {
// kdDebug() << "kmfitem->zone() pointer is valid" << endl;
kmfitem->setText( 0,m_zone->guiName() );
kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->tqmaskLength() ) );
kmfitem->setText( 1, "[" + m_zone->address()->toString() + i18n("/%1]").tqarg( m_zone->maskLength() ) );
m_network_widget->loadZone( m_zone );
if ( m_zone->readOnly() ) {
@ -206,7 +206,7 @@ void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z ) {
kdDebug() << "void KMFMyNetworkWidget::slotZoneChanged( KMFNetZone* z )" << endl;
if ( KMFListViewItem *item = findItem( z->uuid() ) ) {
kdDebug() << "Updating item" << endl;
item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->tqmaskLength() ) );
item->setText( 1, "[" + z->address()->toString() + i18n("/%1]").tqarg( z->maskLength() ) );
item->setText( 4, z->description() );
}

12
kmyfirewall/kmfwidgets/kmfnethostpropertieswidget.cpp
Unescape View File

@ -134,10 +134,10 @@ void KMFNetHostPropertiesWidget::loadHost( KMFNetHost* host ) {
m_cb_limit_host_interval->setEnabled( false );
}
KMFNetZone* tqparentZone = m_host->zone()->rootZone();
if ( tqparentZone->name() == "incoming_world" ) {
KMFNetZone* parentZone = m_host->zone()->rootZone();
if ( parentZone->name() == "incoming_world" ) {
m_cb_host_log->setChecked( m_host->logIncoming() );
} else if ( tqparentZone->name() == "outgoing_world" ) {
} else if ( parentZone->name() == "outgoing_world" ) {
m_cb_host_log->setChecked( m_host->logOutgoing() );
}
@ -176,8 +176,8 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) {
return;
kdDebug() << "Changing host: " << m_host->guiName() << endl;
KMFNetZone* tqparentZone = m_host->zone()->rootZone();
if ( tqparentZone->name() == "incoming_world" ) {
KMFNetZone* parentZone = m_host->zone()->rootZone();
if ( parentZone->name() == "incoming_world" ) {
if ( m_host->logIncoming() == m_cb_host_log->isChecked() ) {
return;
}
@ -187,7 +187,7 @@ void KMFNetHostPropertiesWidget::slotHostLogToggled( bool ) {
);
m_host->setLogIncoming( m_cb_host_log->isChecked() );
KMFUndoEngine::instance()->endTransaction();
} else if ( tqparentZone->name() == "outgoing_world" ) {
} else if ( parentZone->name() == "outgoing_world" ) {
if ( m_host->logOutgoing() == m_cb_host_log->isChecked() ) {
return;
}

2
kmyfirewall/kmfwidgets/kmfnetworkwidget.cpp
Unescape View File

@ -114,7 +114,7 @@ void KMFNetworkWidget::slotShortMaskChanged( int len ) {
IPAddress addr = IPAddress::calcNetworkMaskFromLength( len );
blockAllSignals( true );
lbl_tqmask->setText( addr.toString() );
if ( m_allowEdit && m_zone->tqmaskLength() != len ) {
if ( m_allowEdit && m_zone->maskLength() != len ) {
KMFUndoEngine::instance()->startTransaction(
m_zone->rootZone(),
i18n( "Change tqmask length of Zone: %1" ).tqarg( m_zone->guiName() )

8
kmyfirewall/kmfwidgets/kmfprotocollistview.cpp
Unescape View File

@ -158,17 +158,17 @@ void KMFProtocolListView::loadProtocols() {
TQString cat = prot->category()->name();
TQListViewItem *tqparentItem = m_lv_protocols->tqfindItem( cat, 0 );
TQListViewItem *parentItem = m_lv_protocols->tqfindItem( cat, 0 );
if ( ! tqparentItem ) {
if ( ! parentItem ) {
KMFListViewItem *newParentItem = new KMFListViewItem( m_lv_protocols, 0, prot->category() );
newParentItem->setText( 0, cat );
newParentItem->loadNetfilterObject( prot->category() );
newParentItem->setOpen( true );
tqparentItem = newParentItem;
parentItem = newParentItem;
}
KMFCheckListItem *item = new KMFCheckListItem( tqparentItem, 0 , prot->name() , TQCheckListItem::CheckBox, protUsage );
KMFCheckListItem *item = new KMFCheckListItem( parentItem, 0 , prot->name() , TQCheckListItem::CheckBox, protUsage );
item->setText( 0, prot->name() );
// item->setText( 1, prot->uuid().toString() );
}

2
kmyfirewall/kmfwidgets/kmyfirewalldocumentinfo.ui
Unescape View File

@ -180,5 +180,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/kmfwidgets/kmyfirewallgenericinterfaceeditprotocolwidget.ui
Unescape View File

@ -338,7 +338,7 @@ This required if you like to use a protocol not directely suppotred by KMyFirewa
</widget>
</vbox>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>kpushbutton.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewallhostwidget.ui
Unescape View File

@ -423,7 +423,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewallinterfacewidget.ui
Unescape View File

@ -143,7 +143,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>klineedit.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewalliptdocoptions.ui
Unescape View File

@ -398,5 +398,5 @@
<Q_SLOTS>
<slot>slotHelp()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/kmfwidgets/kmyfirewallipv4adddresswidget.ui
Unescape View File

@ -151,7 +151,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewallmultiportwidget.ui
Unescape View File

@ -222,7 +222,7 @@ Use this to avoid too large (slow) rulesets.</string>
<Q_SIGNALS>
<signal>sigMultiPortChanged(bool)</signal>
</Q_SIGNALS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>tqwidget.h</includehint>
</includehints>

2
kmyfirewall/kmfwidgets/kmyfirewallmynetworkwidget.ui
Unescape View File

@ -180,7 +180,7 @@
<Q_SLOTS>
<slot>m_lv_zones_itemRenamed( TQListViewItem *, int, const QString &amp; )</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>ktabwidget.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewallnethostproperties.ui
Unescape View File

@ -230,5 +230,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/kmfwidgets/kmyfirewallnetworkwidget.ui
Unescape View File

@ -319,7 +319,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewallnewdocument.ui
View File

File diff suppressed because one or more lines are too long

2
kmyfirewall/kmfwidgets/kmyfirewallobjectinfo.ui
Unescape View File

@ -162,5 +162,5 @@
<slot>accept()</slot>
<slot>slotHelp()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/kmfwidgets/kmyfirewallportwidget.ui
Unescape View File

@ -173,5 +173,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/kmfwidgets/kmyfirewallprotocollistview.ui
Unescape View File

@ -63,7 +63,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
</includehints>

2
kmyfirewall/kmfwidgets/kmyfirewallprotocolpropertieswidget.ui
Unescape View File

@ -169,5 +169,5 @@
<slot>setEnabled(bool)</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/kmfwidgets/kmyfirewallselectactivetarget.ui
Unescape View File

@ -172,7 +172,7 @@
</widget>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
<includehint>kpushbutton.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewallselectinterface.ui
View File

File diff suppressed because one or more lines are too long

2
kmyfirewall/kmfwidgets/kmyfirewallsystemsettingslinux.ui
Unescape View File

@ -183,7 +183,7 @@
</spacer>
</grid>
</widget>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kcombobox.h</includehint>
<includehint>kurlrequester.h</includehint>

2
kmyfirewall/kmfwidgets/kmyfirewalltemplatechooser.ui
Unescape View File

@ -470,5 +470,5 @@
<slot>reject()</slot>
</connection>
</connections>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/kmfwidgets/kmyfirewalltransactionlog.ui
Unescape View File

@ -333,7 +333,7 @@
<includes>
<include location="local" impldecl="in implementation">kmyfirewalltransactionlog.ui.h</include>
</includes>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistview.h</includehint>
<includehint>klistview.h</includehint>

2
kmyfirewall/ruleoptionplugins/custom_option/kmyfirewallruleeditorcustomrule.ui
Unescape View File

@ -365,7 +365,7 @@
<slot>reject()</slot>
<slot>accept()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>tqwidget.h</includehint>
</includehints>

2
kmyfirewall/ruleoptionplugins/interface_option/kmfruleeditorinterface.cpp
Unescape View File

@ -93,7 +93,7 @@ void KMFRuleEditorInterface::loadRule( IPTRule * rule ) {
/** No descriptions */
void KMFRuleEditorInterface::slotOk() {
// KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)tqparentWidget();
// KMyFirewallRuleEditor* ed = (KMyFirewallRuleEditor*)parentWidget();
KMFUndoEngine::instance()->startTransaction(
m_rule,
i18n("Edit Rule: %1 Interface Option").tqarg( m_rule->name() )

2
kmyfirewall/ruleoptionplugins/interface_option/kmyfirewallruleeditorinterface.ui
Unescape View File

@ -432,7 +432,7 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>

2
kmyfirewall/ruleoptionplugins/ip_option/kmyfirewallruleeditorip.ui
Unescape View File

@ -296,7 +296,7 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>

2
kmyfirewall/ruleoptionplugins/limit_option/kmyfirewallruleeditorlimit.ui
Unescape View File

@ -435,7 +435,7 @@
<slot>slotOk()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>tqwidget.h</includehint>
<includehint>kpushbutton.h</includehint>

2
kmyfirewall/ruleoptionplugins/log_target_option/kmyfirewallruleeditortargetlog.ui
Unescape View File

@ -263,5 +263,5 @@
<slot>reject()</slot>
<slot>accept()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/ruleoptionplugins/mac_option/kmyfirewallruleeditormac.ui
Unescape View File

@ -495,7 +495,7 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>kpushbutton.h</includehint>
</includehints>

2
kmyfirewall/ruleoptionplugins/mark_target_option/kmyfirewallruleeditortargetmark.ui
Unescape View File

@ -138,5 +138,5 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/ruleoptionplugins/nat_target_option/kmyfirewallruleeditortargetnat.ui
Unescape View File

@ -335,5 +335,5 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

20
kmyfirewall/ruleoptionplugins/protocol_option/kmfruleeditorprotocol.cpp
Unescape View File

@ -330,26 +330,26 @@ void KMFRuleEditorProtocol::loadRule( IPTRule* rule ) {
}
delim = flags.tqfind( " " );
kdDebug() << "found Whitespace at " << delim << endl;
TQString tqmask_lst = flags.left( delim );
kdDebug() << "Flags for Mask: " << tqmask_lst << endl;
TQString mask_lst = flags.left( delim );
kdDebug() << "Flags for Mask: " << mask_lst << endl;
TQString comp_lst = flags.right( flags.length() - delim );
kdDebug() << "Flags for Comp: " << comp_lst << endl;
if ( tqmask_lst.tqcontains( "SYN" ) > 0 )
if ( mask_lst.tqcontains( "SYN" ) > 0 )
c_syn_tqmask->setChecked( true );
if ( tqmask_lst.tqcontains( "ACK" ) > 0 )
if ( mask_lst.tqcontains( "ACK" ) > 0 )
c_ack_tqmask->setChecked( true );
if ( tqmask_lst.tqcontains( "FIN" ) > 0 )
if ( mask_lst.tqcontains( "FIN" ) > 0 )
c_fin_tqmask->setChecked( true );
if ( tqmask_lst.tqcontains( "RST" ) > 0 )
if ( mask_lst.tqcontains( "RST" ) > 0 )
c_rst_tqmask->setChecked( true );
if ( tqmask_lst.tqcontains( "URG" ) > 0 )
if ( mask_lst.tqcontains( "URG" ) > 0 )
c_urg_tqmask->setChecked( true );
if ( tqmask_lst.tqcontains( "PSH" ) > 0 )
if ( mask_lst.tqcontains( "PSH" ) > 0 )
c_psh_tqmask->setChecked( true );
if ( tqmask_lst.tqcontains( "NONE" ) > 0 )
if ( mask_lst.tqcontains( "NONE" ) > 0 )
c_none_tqmask->setChecked( true );
if ( tqmask_lst.tqcontains( "ALL" ) > 0 )
if ( mask_lst.tqcontains( "ALL" ) > 0 )
c_all_tqmask->setChecked( true );
if ( comp_lst.tqcontains( "SYN" ) > 0 )

10
kmyfirewall/ruleoptionplugins/protocol_option/kmyfirewallruleeditorprotocol.ui
Unescape View File

@ -322,9 +322,9 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
<property name="title">
<string>Mask</string>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@ -466,9 +466,9 @@ You may use a portnumber an inclusive portrange or a service name from &lt;i&gt;
<property name="title">
<string>Comp</string>
</property>
<property name="tqlayoutMargin" stdset="0">
<property name="layoutMargin" stdset="0">
</property>
<property name="tqlayoutSpacing" stdset="0">
<property name="layoutSpacing" stdset="0">
</property>
<grid>
<property name="name">
@ -1185,5 +1185,5 @@ A misuse of this functionality may result in a hard to detect bug in the firewal
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/ruleoptionplugins/state_option/kmyfirewallruleeditorstate.ui
Unescape View File

@ -434,5 +434,5 @@
<slot>slotOk()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/ruleoptionplugins/tos_option/kmyfirewallruleeditortos.ui
Unescape View File

@ -169,5 +169,5 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

2
kmyfirewall/ruleoptionplugins/tos_target_option/kmyfirewallruleeditortos.ui
Unescape View File

@ -169,5 +169,5 @@
<slot>accept()</slot>
<slot>reject()</slot>
</Q_SLOTS>
<tqlayoutdefaults spacing="6" margin="11"/>
<layoutdefaults spacing="6" margin="11"/>
</UI>

Write Preview
Loading…
Cancel
Save