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

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

6 files changed, 21 insertions, 21 deletions

diff --git a/kmyfirewall/core/ipaddress.h b/kmyfirewall/core/ipaddress.h
index 9bf8b2c..d80cd44 100644
--- a/kmyfirewall/core/ipaddress.h
+++ b/kmyfirewall/core/ipaddress.h
@@ -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 );
diff --git a/kmyfirewall/core/kmfnethost.h b/kmyfirewall/core/kmfnethost.h
index 44c2dad..dd30f4a 100644
--- a/kmyfirewall/core/kmfnethost.h
+++ b/kmyfirewall/core/kmfnethost.h
@@ -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;
diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp
index 6beeb06..9b9934b 100644
--- a/kmyfirewall/core/kmfnetzone.cpp
+++ b/kmyfirewall/core/kmfnetzone.cpp
@@ -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() ) {
diff --git a/kmyfirewall/core/kmfnetzone.h b/kmyfirewall/core/kmfnetzone.h
index 064bd3c..919fcf4 100644
--- a/kmyfirewall/core/kmfnetzone.h
+++ b/kmyfirewall/core/kmfnetzone.h
@@ -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;	
diff --git a/kmyfirewall/core/kmfnetzonelist.cpp b/kmyfirewall/core/kmfnetzonelist.cpp
index 50cf68b..128bffa 100644
--- a/kmyfirewall/core/kmfnetzonelist.cpp
+++ b/kmyfirewall/core/kmfnetzonelist.cpp
@@ -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;
diff --git a/kmyfirewall/core/netfilterobject.h b/kmyfirewall/core/netfilterobject.h
index 9d08f69..39e6057 100644
--- a/kmyfirewall/core/netfilterobject.h
+++ b/kmyfirewall/core/netfilterobject.h
@@ -145,7 +145,7 @@ public:
 	void changed();
 	
 	/** Get the Parent object */
-	NetfilterObject* tqparentObj() const {
+	NetfilterObject* parentObj() const {
 		return m_parent;
 	}