1 files changed, 14 insertions, 14 deletions

diff --git a/kmyfirewall/core/kmfnetzone.cpp b/kmyfirewall/core/kmfnetzone.cpp
index 042d562..9b4a974 100644
--- a/kmyfirewall/core/kmfnetzone.cpp
+++ b/kmyfirewall/core/kmfnetzone.cpp
@@ -50,8 +50,8 @@
 
 namespace KMF {
 
-KMFNetZone::KMFNetZone( NetfilterObject *tqparent, const char* name, const TQString& zoneName ) : NetfilterObject( tqparent, name ) {
-	kdDebug() << "KMFNetZone::KMFNetZone( NetfilterObject *tqparent, const char* name, const TQString& zoneName )" << endl;
+KMFNetZone::KMFNetZone( NetfilterObject *parent, const char* name, const TQString& zoneName ) : NetfilterObject( parent, name ) {
+	kdDebug() << "KMFNetZone::KMFNetZone( NetfilterObject *parent, const char* name, const TQString& zoneName )" << endl;
 	m_doc = 0;
 	m_network = 0;
 	m_zone = 0;
@@ -67,14 +67,14 @@ KMFNetZone::KMFNetZone( NetfilterObject *tqparent, const char* name, const TQStr
 	} else {
 		setName( zoneName );
 	}
-	if ( KMFNetZone * zone = dynamic_cast<KMFNetZone*> ( tqparent ) ) {
+	if ( KMFNetZone * zone = dynamic_cast<KMFNetZone*> ( parent ) ) {
 		m_zoneType = NODE;
 		m_zone = zone;
-		setZone( *m_zone->address(), m_zone->maskLength() /* , *m_zone->tqmask() */ );
-	} else if ( KMFGenericDoc * doc = dynamic_cast<KMFGenericDoc*> ( tqparent ) ) {
+		setZone( *m_zone->address(), m_zone->maskLength() /* , *m_zone->mask() */ );
+	} else if ( KMFGenericDoc * doc = dynamic_cast<KMFGenericDoc*> ( parent ) ) {
 		m_zoneType = ROOT;
 		m_doc = doc;
-	} else if ( KMFNetwork * doc = dynamic_cast<KMFNetwork*> ( tqparent ) ) {
+	} else if ( KMFNetwork * doc = dynamic_cast<KMFNetwork*> ( parent ) ) {
 		m_zoneType = ROOT;
 		m_network = doc;
 	}
@@ -93,9 +93,9 @@ KMFNetZone::~KMFNetZone() {
 }
 
 int KMFNetZone::operator==( const KMFNetZone& zone ) {
-	if ( IPAddress::calcLenthToMask( *tqmask() ) >  IPAddress::calcLenthToMask( *zone.tqmask() ) ) {
+	if ( IPAddress::calcLenthToMask( *mask() ) >  IPAddress::calcLenthToMask( *zone.mask() ) ) {
 		return 1;
-	} else if ( IPAddress::calcLenthToMask( *tqmask() ) == IPAddress::calcLenthToMask( *zone.tqmask() ) ){
+	} else if ( IPAddress::calcLenthToMask( *mask() ) == IPAddress::calcLenthToMask( *zone.mask() ) ){
 		return 0;
 	} else {
 		return -1;
@@ -103,9 +103,9 @@ int KMFNetZone::operator==( const KMFNetZone& zone ) {
 }
 
 bool KMFNetZone::isSameZone( KMFNetZone* zone ) {
-	if ( IPAddress::calcLenthToMask( *tqmask() ) >  IPAddress::calcLenthToMask( *zone->tqmask() ) ) {
+	if ( IPAddress::calcLenthToMask( *mask() ) >  IPAddress::calcLenthToMask( *zone->mask() ) ) {
 		return false;
-	} else if ( IPAddress::calcLenthToMask( *tqmask() ) == IPAddress::calcLenthToMask( *zone->tqmask() ) ){
+	} else if ( IPAddress::calcLenthToMask( *mask() ) == IPAddress::calcLenthToMask( *zone->mask() ) ){
 		return true;
 	} else {
 		return false;
@@ -797,9 +797,9 @@ const TQDomDocument& KMFNetZone::getDOMTree() {
 	TQString num;
 	from.setAttribute( XML::Address_Attribute, address()->toString() );
 
-	TQDomElement tqmask = doc.createElement( XML::NetMask_Element );
-	root.appendChild( tqmask );
-	tqmask.setAttribute( XML::Address_Attribute, maskLength() );
+	TQDomElement mask = doc.createElement( XML::NetMask_Element );
+	root.appendChild( mask );
+	mask.setAttribute( XML::Address_Attribute, maskLength() );
 
 	TQPtrListIterator<KMFNetZone> it ( m_zones );
 	while ( it.current() ) {
@@ -867,7 +867,7 @@ void KMFNetZone::loadXML( TQDomNode root, TQStringList& errors ) {
 				if ( ok ) {
 					setMaskLength( len );
 				} else {
-					kdDebug() << "Parsing tqmask failed" << endl;
+					kdDebug() << "Parsing mask failed" << endl;
 				}
 			}
 		}