rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

28 files changed, 331 insertions, 331 deletions

diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index f16ad0ad..3b564c17 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -765,8 +765,8 @@ namespace KviTQString
 	
 		//          s1
 		//          m1
-		// tqmask1 : *xor
-		// tqmask2 : xorand*xor
+		// mask1 : *xor
+		// mask2 : xorand*xor
 		//         m2
 		//          s2
 	
@@ -794,7 +794,7 @@ namespace KviTQString
 		const TQChar * savePos2 = m2;
 		while(m1->tqunicode())
 		{
-			//loop managed by m1 (initially first tqmask)
+			//loop managed by m1 (initially first mask)
 			if(m1->tqunicode()=='*')
 			{
 				//Found a wildcard in m1
@@ -825,8 +825,8 @@ namespace KviTQString
 				if(m2->tqunicode() == '*')
 				{
 					//A wlidcard in the second string
-					//Invert the game : tqmask1 <-> tqmask2
-					//tqmask2 now leads the game...
+					//Invert the game : mask1 <-> mask2
+					//mask2 now leads the game...
 					savePos1 = m1;          //aux
 					m1 = m2;                //...swap
 					m2 = savePos1;          //...swap
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index 3eb7fa67..525ad714 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -402,8 +402,8 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
 
 	//          s1
 	//          m1
-	// tqmask1 : *xor
-	// tqmask2 : xorand*xor
+	// mask1 : *xor
+	// mask2 : xorand*xor
 	//         m2
 	//          s2
 
@@ -423,7 +423,7 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
 	const char * savePos2 = m2;
 	while(*m1)
 	{
-		//loop managed by m1 (initially first tqmask)
+		//loop managed by m1 (initially first mask)
 		if(*m1=='*')
 		{
 			//Found a wildcard in m1
@@ -450,8 +450,8 @@ bool kvi_matchWildExpr(register const char *m1,register const char *m2)
 			if(*m2 == '*')
 			{
 				//A wlidcard in the second string
-				//Invert the game : tqmask1 <-> tqmask2
-				//tqmask2 now leads the game...
+				//Invert the game : mask1 <-> mask2
+				//mask2 now leads the game...
 				savePos1 = m1;          //aux
 				m1 = m2;                //...swap
 				m2 = savePos1;          //...swap
@@ -497,7 +497,7 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2)
 	if(!(m1 && m2 && (*m1)))return false;
 	const char * savePos1 = 0;
 	const char * savePos2 = m2;
-	while(*m1){ //loop managed by m1 (initially first tqmask)
+	while(*m1){ //loop managed by m1 (initially first mask)
 		if(*m1=='*'){
 			//Found a wildcard in m1
 			savePos1 = ++m1;            //move to the next char and save the position...this is our jolly
@@ -520,8 +520,8 @@ bool kvi_matchWildExprCS(register const char *m1,register const char *m2)
 		} else {
 			if(*m2 == '*'){
 				//A wlidcard in the second string
-				//Invert the game : tqmask1 <-> tqmask2
-				//tqmask2 now leads the game...
+				//Invert the game : mask1 <-> mask2
+				//mask2 now leads the game...
 				savePos1 = m1;          //aux
 				m1 = m2;                //...swap
 				m2 = savePos1;          //...swap
@@ -554,7 +554,7 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char
 	const char * savePos2 = m2;
 	while(NOT_AT_END(m1))
 	{
-		//loop managed by m1 (initially first tqmask)
+		//loop managed by m1 (initially first mask)
 		if(*m1=='*')
 		{
 			//Found a wildcard in m1
@@ -588,8 +588,8 @@ bool kvi_matchWildExprWithTerminator(register const char *m1,register const char
 			if(*m2 == '*')
 			{
 				//A wlidcard in the second string
-				//Invert the game : tqmask1 <-> tqmask2
-				//tqmask2 now leads the game...
+				//Invert the game : mask1 <-> mask2
+				//mask2 now leads the game...
 				bSwapped = !bSwapped;
 				savePos1 = m1;          //aux
 				m1 = m2;                //...swap
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index d7adeb2e..e961359d 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -98,13 +98,13 @@ KviMediaType * KviMediaManager::findMediaTypeByIanaType(const char * ianaType)
 	return 0;
 }
 
-KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filetqmask)
+KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filemask)
 {
 	__range_valid(locked());
 	for(KviMediaType * mt = m_pMediaTypeList->first();mt;mt = m_pMediaTypeList->next())
 	{
 // FIXME: #warning "Should this be case sensitive ?"
-		if(kvi_strEqualCI(mt->szFileMask.ptr(),filetqmask))return mt;
+		if(kvi_strEqualCI(mt->szFileMask.ptr(),filemask))return mt;
 	}
 
 	return 0;
@@ -137,7 +137,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 	{
 		if(iWildCount)
 		{
-			// the new tqmask has wildcards... if the current one has none, skip it
+			// the new mask has wildcards... if the current one has none, skip it
 			int iWildCountExisting = mt->szFileMask.occurences('*');
 			if(iWildCountExisting)
 			{
@@ -164,7 +164,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 				}
 			} // else the current has no wildcards...skip
 		} else {
-			// the new tqmask has no wildcards....
+			// the new mask has no wildcards....
 			if(mt->szFileMask.contains('*'))
 			{
 				// current one has wildcards...insert
@@ -433,7 +433,7 @@ KviMediaType * KviMediaManager::findMediaTypeForRegularFile(const char * szFullP
 
 typedef struct _KviDefaultMediaType
 {
-	const char * filetqmask;
+	const char * filemask;
 	const char * magicbytes;
 	const char * ianatype;
 	const char * description;
@@ -489,12 +489,12 @@ void KviMediaManager::load(const char * filename)
 		insertMediaType(m);
 	}
 
-	for(int u = 0;g_defMediaTypes[u].filetqmask;u++)
+	for(int u = 0;g_defMediaTypes[u].filemask;u++)
 	{
-		if(!findMediaTypeByFileMask(g_defMediaTypes[u].filetqmask))
+		if(!findMediaTypeByFileMask(g_defMediaTypes[u].filemask))
 		{
 			KviMediaType * m = new KviMediaType;
-			m->szFileMask = g_defMediaTypes[u].filetqmask;
+			m->szFileMask = g_defMediaTypes[u].filemask;
 			m->szMagicBytes = g_defMediaTypes[u].magicbytes;
 			m->szIanaType = g_defMediaTypes[u].ianatype;
 			m->szDescription = g_defMediaTypes[u].description;
diff --git a/src/kvilib/ext/kvi_mediatype.h b/src/kvilib/ext/kvi_mediatype.h
index 99b427f9..77e96594 100644
--- a/src/kvilib/ext/kvi_mediatype.h
+++ b/src/kvilib/ext/kvi_mediatype.h
@@ -67,7 +67,7 @@ private:
 	KviMediaType * findMediaTypeForRegularFile(const char * szFullPath,const char * szFileName,bool bCheckMagic);
 public:
 	KviPointerList<KviMediaType> * mediaTypeList(){ return m_pMediaTypeList; };
-	KviMediaType * findMediaTypeByFileMask(const char * filetqmask);
+	KviMediaType * findMediaTypeByFileMask(const char * filemask);
 	KviMediaType * findMediaTypeByIanaType(const char * ianaType);
 	bool removeMediaType(KviMediaType * t){ return m_pMediaTypeList->removeRef(t); };
 	void clear(){ m_pMediaTypeList->clear(); };
diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp
index 434ebd9f..9cddac5c 100644
--- a/src/kvilib/ext/kvi_regchan.cpp
+++ b/src/kvilib/ext/kvi_regchan.cpp
@@ -28,10 +28,10 @@
 #include "kvi_config.h"
 #include "kvi_qstring.h"
 
-KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &nettqmask)
+KviRegisteredChannel::KviRegisteredChannel(const KviStr &name,const KviStr &netmask)
 {
 	m_szName = name;
-	m_szNetMask = nettqmask;
+	m_szNetMask = netmask;
 	m_pPropertyDict = new KviPointerHashTable<const char *,KviStr>(7,false,true);
 	m_pPropertyDict->setAutoDelete(true);
 }
@@ -111,13 +111,13 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::find(const char * name,cons
 	return 0;
 }
 
-KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * nettqmask)
+KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * netmask)
 {
 	KviRegisteredChannelList * l = m_pChannelDict->find(name);
 	if(!l)return 0;
 	for(KviRegisteredChannel * c = l->first();c;c = l->next())
 	{
-		if(kvi_strEqualCI(c->netMask().ptr(),nettqmask))return c;
+		if(kvi_strEqualCI(c->netMask().ptr(),netmask))return c;
 	}
 	return 0;
 }
diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h
index 5cdad198..f447c313 100644
--- a/src/kvilib/ext/kvi_regchan.h
+++ b/src/kvilib/ext/kvi_regchan.h
@@ -35,7 +35,7 @@ class KVILIB_API KviRegisteredChannel : public KviHeapObject
 {
 	friend class KviRegisteredChannelDataBase;
 public:
-	KviRegisteredChannel(const KviStr &name,const KviStr &nettqmask);
+	KviRegisteredChannel(const KviStr &name,const KviStr &netmask);
 	~KviRegisteredChannel();
 protected:
 	KviStr               m_szName;
@@ -63,7 +63,7 @@ protected:
 public:
 	KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; };
 	KviRegisteredChannel * find(const char * name,const char * net);
-	KviRegisteredChannel * findExact(const char * name,const char * nettqmask);
+	KviRegisteredChannel * findExact(const char * name,const char * netmask);
 	void remove(KviRegisteredChannel * c);
 	void add(KviRegisteredChannel * c);
 	void load(const char * filename);
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index 6145d0ba..1edd2d77 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -42,7 +42,7 @@
 	@short:
 		Registration of users in KVIrc
 	@keyterms:
-		registered users, registration tqmask, registered user properties,
+		registered users, registration mask, registered user properties,
 		user properties, notify property, avatar property
 	@body:
 		[big]Introduction[/big][br]
@@ -59,7 +59,7 @@
 		are used to recognize the user on irc.[br]
 		[br]
 		[big]Registration masks[/big][br]
-		The masks have the common IRC tqmask format: [b]<nick>!<user>@<host>[/b][br]
+		The masks have the common IRC mask format: [b]<nick>!<user>@<host>[/b][br]
 		The masks may contain '*' and '?' wildcards that match any portion of text.[br]
 		[b]*!*@*[/b][br]
 		[b]Pragma!*@*[/b][br]
@@ -69,33 +69,33 @@
 		[b]Pragma!~daemon@some.host.it[/b][br]
 		Are examples of valid registration masks.[br]
 		The masks with wildcards can actually match more than a single user.[br]
-		For example the tqmask *!root@*.host.com will match all the users
+		For example the mask *!root@*.host.com will match all the users
 		having root as username and coming from the host.com domain.[br]
 		For this reason putting wildcards in nicknames could become a problem
 		if not used carefully (but may also be used to achieve interesting tricks).[br]
 		If you don't use wildcards in nicknames you are sure that
-		in a single irc connection , a tqmask will always refer to a single user.[br]
+		in a single irc connection , a mask will always refer to a single user.[br]
 		You will commonly use the following format:[br]
 		<nick>!*<username>@*.<host>.<top>[br]
 		or[br]
 		<nick>!*<username>@<number>.<number>.<number>.*[br]
-		In this way you can be 95% sure that the tqmask will really match the correct user.[br]
+		In this way you can be 95% sure that the mask will really match the correct user.[br]
 		[br]
 		[big]Example of registration and lookups[/big]
 		Assume that you want to registere a friend of yours: Derek Riggs.[br]
 		Derek often uses "Eddie" as his nickname
 		"stranger" as username and has a dial-up connection that makes his IP address appear as
 		<variable-number>.somewhere.in.time.org.[br]
-		You will add an entry with name "Derek Riggs" and a registration tqmask like the following:
+		You will add an entry with name "Derek Riggs" and a registration mask like the following:
 		Eddie!stranger@*.somewhere.in.time.org.[br]
 		If the IRC servers keep adding strange characters ([doc:irc_masks]prefixes[/doc]) at the beginning of his username you may use
 		Eddie!*stranger@*.somewhere.in.time.org.[br]
-		If Eddie also often connects from the wasted.years.org domain and gets 'eddie' as username there, you might add a second registration tqmask as follows:
+		If Eddie also often connects from the wasted.years.org domain and gets 'eddie' as username there, you might add a second registration mask as follows:
 		Eddie!*eddie@*.wasted.years.org.[br]
-		An alternative could be use only one tqmask with *.org as domain and allow any username (Eddie!*@*.org) but this
+		An alternative could be use only one mask with *.org as domain and allow any username (Eddie!*@*.org) but this
 		could become dangerous since it could match the users that you don't want to.[br]
 		On the other hand, if you dislike the users with the nickname Eddie that come from .org
-		and you're implementing an auto-kick system, the correct tqmask to register is "Eddie!*@*.org".[br]
+		and you're implementing an auto-kick system, the correct mask to register is "Eddie!*@*.org".[br]
 		[br]
 		KVirc ties to be smart , and always find the most correct match for an user:
 		If you have two masks registered: Pragma!*xor@*.myisp.it and *!*@*.myisp.it,
@@ -162,47 +162,47 @@ bool KviRegisteredUser::isIgnoreEnabledFor(IgnoreFlags flag)
 	return m_iIgnoreFlags & flag;
 }
 
-KviIrcMask * KviRegisteredUser::findMask(const KviIrcMask &tqmask)
+KviIrcMask * KviRegisteredUser::findMask(const KviIrcMask &mask)
 {
 	for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
 	{
-		if(*m == tqmask)return m;
+		if(*m == mask)return m;
 	}
 	return 0;
 }
 
-bool KviRegisteredUser::addMask(KviIrcMask * tqmask)
+bool KviRegisteredUser::addMask(KviIrcMask * mask)
 {
-	if(findMask(*tqmask))
+	if(findMask(*mask))
 	{
-		delete tqmask;
-        tqmask = 0;
+		delete mask;
+        mask = 0;
 		return false;
 	}
-	m_pMaskList->append(tqmask);
+	m_pMaskList->append(mask);
 	return true;
 }
 
-bool KviRegisteredUser::removeMask(KviIrcMask * tqmask)
+bool KviRegisteredUser::removeMask(KviIrcMask * mask)
 {
-	if(!tqmask)return false;
-	return m_pMaskList->removeRef(tqmask);
+	if(!mask)return false;
+	return m_pMaskList->removeRef(mask);
 }
 
-bool KviRegisteredUser::matches(const KviIrcMask &tqmask)
+bool KviRegisteredUser::matches(const KviIrcMask &mask)
 {
 	for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
 	{
-		if(m->matches(tqmask))return true;
+		if(m->matches(mask))return true;
 	}
 	return false;
 }
 
-bool KviRegisteredUser::matchesFixed(const KviIrcMask &tqmask)
+bool KviRegisteredUser::matchesFixed(const KviIrcMask &mask)
 {
 	for(KviIrcMask * m = m_pMaskList->first();m;m = m_pMaskList->next())
 	{
-		if(m->matchesFixed(tqmask))return true;
+		if(m->matchesFixed(mask))return true;
 	}
 	return false;
 }
@@ -359,9 +359,9 @@ KviRegisteredUser * KviRegisteredUserDataBase::getUser(const TQString & name)
 	return u;
 }
 
-static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *tqmask)
+static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *mask)
 {
-	KviRegisteredMask * newMask = new KviRegisteredMask(u,tqmask);
+	KviRegisteredMask * newMask = new KviRegisteredMask(u,mask);
 	int idx = 0;
 	for(KviRegisteredMask * m = l->first();m;m = l->next())
 	{
@@ -375,20 +375,20 @@ static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,Kv
 	l->append(newMask);
 }
 
-KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * tqmask)
+KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * mask)
 {
-	if(!u || !tqmask) return 0;
+	if(!u || !mask) return 0;
 	__range_valid(u == m_pUserDict->find(u->name()));
 
 	KviRegisteredMaskList * l;
-	if(tqmask->hasWildNick())
+	if(mask->hasWildNick())
 	{
 		for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 		{
-			if(*(m->tqmask()) == *tqmask)
+			if(*(m->mask()) == *mask)
 			{
-				delete tqmask;
-                tqmask = 0;
+				delete mask;
+                mask = 0;
 				return m->user();
 			}
 		}
@@ -396,44 +396,44 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
 		// masks with more info go first in the list
 		l = m_pWildMaskList;
 	} else {
-		l = m_pMaskDict->find(tqmask->nick());
+		l = m_pMaskDict->find(mask->nick());
 		if(l)
 		{
 			// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
 			for(KviRegisteredMask * m = l->first();m;m = l->next())
 			{
-				if(*(m->tqmask()) == *tqmask)
+				if(*(m->mask()) == *mask)
 				{
-					delete tqmask;
-                    tqmask = 0;
+					delete mask;
+                    mask = 0;
 					return m->user();
 				}
 			}
 			// not found ...ok... add it
 		} else {
 			// not found ...ok... add it
-			// this is the first tqmask in the list
+			// this is the first mask in the list
 			l = new KviRegisteredMaskList;
 			l->setAutoDelete(true);
-			if(!u->addMask(tqmask))
+			if(!u->addMask(mask))
 			{
 				debug(" Ops...got an incoherent regusers action...recovered ?");
 				delete l;
                 l = 0;
 			} else {
-				append_mask_to_list(l,u,tqmask);
-				m_pMaskDict->insert(tqmask->nick(),l);
+				append_mask_to_list(l,u,mask);
+				m_pMaskDict->insert(mask->nick(),l);
 			}
 			return 0;
 		}
 	}
 	// Ok...add it
-	if(!u->addMask(tqmask))
+	if(!u->addMask(mask))
 	{
 		debug("ops...got an incoherent regusers action...recovered ?");
 		return 0; // ops...already there ?
 	}
-	append_mask_to_list(l,u,tqmask);
+	append_mask_to_list(l,u,mask);
 	return 0;
 }
 
@@ -488,9 +488,9 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name)
 	if(name.isEmpty()) return false;
 	KviRegisteredUser * u = m_pUserDict->find(name);
 	if(!u)return false;
-	while(KviIrcMask * tqmask = u->maskList()->first())
+	while(KviIrcMask * mask = u->maskList()->first())
 	{
-		if(!removeMaskByPointer(tqmask))
+		if(!removeMaskByPointer(mask))
 			debug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
 	}
 	emit(userRemoved(name));
@@ -504,13 +504,13 @@ bool KviRegisteredUserDataBase::removeGroup(const TQString & name)
 	return true;
 }
 
-bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask)
+bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &mask)
 {
-	// find the tqmask pointer
-	KviRegisteredMask * m = findExactMask(tqmask);
+	// find the mask pointer
+	KviRegisteredMask * m = findExactMask(mask);
 	// and remove it
 	if(m){
-		if(removeMaskByPointer(m->tqmask()))
+		if(removeMaskByPointer(m->mask()))
 		{
 			return true;
 		}
@@ -518,36 +518,36 @@ bool KviRegisteredUserDataBase::removeMask(const KviIrcMask &tqmask)
 	return 0;
 }
 
-bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
+bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * mask)
 {
-	if(!tqmask) return 0;
-	if(tqmask->hasWildNick())
+	if(!mask) return 0;
+	if(mask->hasWildNick())
 	{
 		// remove from the wild list
 		for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 		{
-			if(m->tqmask() == tqmask)
+			if(m->mask() == mask)
 			{
 				// ok..got it, remove from the list and from the user struct (user struct deletes it!)
-				emit(userChanged(tqmask->nick()));
-				m->user()->removeMask(tqmask);    // this one deletes m->tqmask()
+				emit(userChanged(mask->nick()));
+				m->user()->removeMask(mask);    // this one deletes m->mask()
 				m_pWildMaskList->removeRef(m);  // this one deletes m
 				return true;
 			}
 		}
 		// not found ...opz :)
 	} else {
-		KviRegisteredMaskList * l = m_pMaskDict->find(tqmask->nick());
+		KviRegisteredMaskList * l = m_pMaskDict->find(mask->nick());
 		if(l)
 		{
 			// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
 			for(KviRegisteredMask * m = l->first();m;m = l->next())
 			{
-				if(m->tqmask() == tqmask)
+				if(m->mask() == mask)
 				{
-					TQString nick = tqmask->nick();
+					TQString nick = mask->nick();
 					emit(userChanged(nick));
-					m->user()->removeMask(tqmask); // this one deletes m->tqmask() (or tqmask)
+					m->user()->removeMask(mask); // this one deletes m->mask() (or mask)
 					l->removeRef(m);             // this one deletes m
 					if(l->count() == 0)m_pMaskDict->remove(nick);
 					return true;
@@ -563,21 +563,21 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
 
 
 /*
-KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &tqmask)
+KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &mask)
 {
 	// first lookup the nickname in the maskDict
-	KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
+	KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
 	if(l)
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
 		{
-			if(m->tqmask()->matchesFixed(0,tqmask.user(),tqmask.host()))return m->user();
+			if(m->mask()->matchesFixed(0,mask.user(),mask.host()))return m->user();
 		}
 	}
 	// not found....lookup the wild ones
 	for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 	{
-		if(m->tqmask()->matchesFixed(tqmask))return m->user();
+		if(m->mask()->matchesFixed(mask))return m->user();
 	}
 	return 0; // no match at all
 }
@@ -598,40 +598,40 @@ KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString &
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
 		{
-			if(m->tqmask()->matchesFixed(nick,user,host))return m;
+			if(m->mask()->matchesFixed(nick,user,host))return m;
 		}
 	}
 	// not found....lookup the wild ones
 	for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 	{
-		if(m->tqmask()->matchesFixed(nick,user,host))return m;
+		if(m->mask()->matchesFixed(nick,user,host))return m;
 	}
 	return 0; // no match at all
 }
 
-KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask &tqmask)
+KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask &mask)
 {
-	KviRegisteredMask * m = findExactMask(tqmask);
+	KviRegisteredMask * m = findExactMask(mask);
 	if(m)return m->user();
 	return 0;
 }
 
-KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &tqmask)
+KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &mask)
 {
 	// first lookup the nickname in the maskDict
-	if(tqmask.nick()=="") return 0;
-	KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
+	if(mask.nick()=="") return 0;
+	KviRegisteredMaskList * l = m_pMaskDict->find(mask.nick());
 	if(l)
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
 		{
-			if(*(m->tqmask()) == tqmask)return m;
+			if(*(m->mask()) == mask)return m;
 		}
 	}
 	// not found....lookup the wild ones
 	for(KviRegisteredMask * m = m_pWildMaskList->first();m;m = m_pWildMaskList->next())
 	{
-		if(*(m->tqmask()) == tqmask)return m;
+		if(*(m->mask()) == mask)return m;
 	}
 	return 0; // no match at all
 }
@@ -674,8 +674,8 @@ void KviRegisteredUserDataBase::load(const TQString & filename)
 						u->setProperty(tmp,*(sdi.current()));
 					} else if(KviTQString::equalCSN("mask_",tmp,5))
 					{
-						KviIrcMask * tqmask = new KviIrcMask(*(sdi.current()));
-						addMask(u,tqmask);
+						KviIrcMask * mask = new KviIrcMask(*(sdi.current()));
+						addMask(u,mask);
 					} else if(KviTQString::equalCI(tmp,"Group"))
 					{
 						u->setGroup(*(sdi.current()));
@@ -722,9 +722,9 @@ void KviRegisteredUserDataBase::save(const TQString & filename)
 		{
 			TQString tmp;
 			KviTQString::sprintf(tmp,"mask_%d",idx);
-			TQString tqmask;
-			m->tqmask(tqmask,KviIrcMask::NickUserHost);
-			cfg.writeEntry(tmp,tqmask);
+			TQString mask;
+			m->mask(mask,KviIrcMask::NickUserHost);
+			cfg.writeEntry(tmp,mask);
 			++idx;
 		}
 		cfg.writeEntry("Group",it.current()->group());
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h
index 797ae101..6f20422c 100644
--- a/src/kvilib/ext/kvi_regusersdb.h
+++ b/src/kvilib/ext/kvi_regusersdb.h
@@ -27,7 +27,7 @@
 //
 // REGISTERED USERS
 //     
-//     Here we manage users resigered by tqmask and their (generic!) properties
+//     Here we manage users resigered by mask and their (generic!) properties
 //
 
 #include "kvi_settings.h"
@@ -74,10 +74,10 @@ private:
 	KviPointerHashTable<TQString,TQString>           * m_pPropertyDict;   // owned properties
 	KviPointerList<KviIrcMask>     * m_pMaskList;       // owned masks
 protected:
-	// tqmask ownership is transferred! (always!) returns false if the tqmask was already there
-	bool addMask(KviIrcMask * tqmask);
-	bool removeMask(KviIrcMask * tqmask);
-	KviIrcMask * findMask(const KviIrcMask &tqmask);
+	// mask ownership is transferred! (always!) returns false if the mask was already there
+	bool addMask(KviIrcMask * mask);
+	bool removeMask(KviIrcMask * mask);
+	KviIrcMask * findMask(const KviIrcMask &mask);
 public:
 	int  ignoreFlags()                  { return m_iIgnoreFlags; };
 	void setIgnoreFlags(int flags)      {m_iIgnoreFlags=flags; };
@@ -86,8 +86,8 @@ public:
 	bool isIgnoreEnabledFor(IgnoreFlags flag);
 
 	const TQString &name(){ return m_szName; };
-	bool matches(const KviIrcMask &tqmask);
-	bool matchesFixed(const KviIrcMask &tqmask);
+	bool matches(const KviIrcMask &mask);
+	bool matchesFixed(const KviIrcMask &mask);
 	bool matchesFixed(const TQString &nick,const TQString &user,const TQString &host);
 
 	void setProperty(const TQString &name,const TQString &value);
@@ -139,7 +139,7 @@ public:
 public:
 	int                 nonWildChars(){ return m_iMaskNonWildChars; };
 	KviRegisteredUser * user(){ return m_pUser; };
-	KviIrcMask        * tqmask(){ return m_pMask; };
+	KviIrcMask        * mask(){ return m_pMask; };
 };
 
 typedef KviPointerList<KviRegisteredMask> KviRegisteredMaskList;
@@ -173,14 +173,14 @@ public:
 	bool removeUser(const TQString &name);
 	bool removeGroup(const TQString &name);
 	KviRegisteredUser * findUserByName(const TQString &name){ return m_pUserDict->find(name); };
-	// tqmask must be allocated on the heap and the ownership is transferred!
-	// returns non zero if there is already an user with this tqmask (returns the pointer to it!)
-	KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * tqmask);
-	bool removeMaskByPointer(KviIrcMask * tqmask);
-	bool removeMask(const KviIrcMask &tqmask);
+	// mask must be allocated on the heap and the ownership is transferred!
+	// returns non zero if there is already an user with this mask (returns the pointer to it!)
+	KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * mask);
+	bool removeMaskByPointer(KviIrcMask * mask);
+	bool removeMask(const KviIrcMask &mask);
 	KviRegisteredUser * findMatchingUser(const TQString &nick,const TQString &user,const TQString &host);
-	KviRegisteredUser * findUserWithMask(const KviIrcMask &tqmask);
-	KviRegisteredMask * findExactMask(const KviIrcMask &tqmask);
+	KviRegisteredUser * findUserWithMask(const KviIrcMask &mask);
+	KviRegisteredMask * findExactMask(const KviIrcMask &mask);
 	KviRegisteredMask * findMatchingMask(const TQString &nick,const TQString &user,const TQString &host);
 	//Only used in few places (actually one) of the code, but lot of times;perfect for inlining...
 	//bool isIgnoredUser(const char * nick,const char * user,const char * host);
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index 0e793a34..a0d52a77 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -60,7 +60,7 @@
 		with /usr/arch/mp3/SonataArctica_SingInSilence_Live.mp3 as real file path , something like
 		"SonataArctica_SingInSilence.mp3". A remote user will then request you a DCC GET SonataArctica_SingInSilence.mp3
 		and KVIrc will automatically send the file.[br]
-		Each file offer has an "user tqmask" that the requesting remote users must match to
+		Each file offer has an "user mask" that the requesting remote users must match to
 		obtain the file: *!*@* matches any user, Pragma!*@* matches any user with nickname pragma,
 		*!*@*.omnikron.net matches any user coming from the omnikron.net domain.[br]
 		Each offer can have an expire time: the offer will be automatically removed after
@@ -69,8 +69,8 @@
 		use an additional "size" parameter in the DCC GET request.[br]
 		[big]Security issues[/big]
 		This is a nice but unsecure method of sharing files.[br]
-		The user tqmask is a good protection but you have to use it properly!.[br]
-		Setting the user tqmask to Nick!*@* can be easily exploited (just by making an user disconnect
+		The user mask is a good protection but you have to use it properly!.[br]
+		Setting the user mask to Nick!*@* can be easily exploited (just by making an user disconnect
 		in one of the well known ways and then by using his nickname).[br]
 		On the other side, the remote end must know exactly the visible name of the offer to request
 		and noone but you will tell him that name.[br]
@@ -175,7 +175,7 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
 	{
 		if(o->wildcardCount() > 0)
 		{
-			// the new tqmask has wildcards... if the current one has none, skip it
+			// the new mask has wildcards... if the current one has none, skip it
 			if(fo->wildcardCount() > 0)
 			{
 				// the one in the list has wildcards too...
@@ -200,7 +200,7 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
 				}
 			} // else the current has no wildcards...skip
 		} else {
-			// the new tqmask has no wildcards....
+			// the new mask has no wildcards....
 			if(fo->wildcardCount() > 0)
 			{
 				// current one has wildcards...insert
@@ -275,7 +275,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
 	}
 }
 
-KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize)
+KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * mask,unsigned int uFileSize)
 {
 	KviSharedFileList * l = m_pSharedListDict->find(szName);
 	if(!l)return 0;
@@ -283,10 +283,10 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,K
 	for(KviSharedFile * o = l->first();o;o = l->next())
 	{
 		bool bMatch;
-		if(tqmask)
+		if(mask)
 		{
 			KviIrcMask umask(o->userMask());
-			bMatch = tqmask->matchedBy(umask);
+			bMatch = mask->matchedBy(umask);
 		} else bMatch = KviTQString::equalCS(o->userMask(),"*!*@*");
 		if(bMatch)
 		{
diff --git a/src/kvilib/ext/kvi_sharedfiles.h b/src/kvilib/ext/kvi_sharedfiles.h
index 385682a2..64b22638 100644
--- a/src/kvilib/ext/kvi_sharedfiles.h
+++ b/src/kvilib/ext/kvi_sharedfiles.h
@@ -84,7 +84,7 @@ private:
 public:
 	void addSharedFile(KviSharedFile * f);
 	KviSharedFile * addSharedFile(const TQString &szName,const TQString &szAbsPath,const TQString &szMask,int timeoutInSecs);
-	KviSharedFile * lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize = 0);
+	KviSharedFile * lookupSharedFile(const TQString &szName,KviIrcMask * mask,unsigned int uFileSize = 0);
 	bool removeSharedFile(const TQString &szName,const TQString &szMask,unsigned int uFileSize);
 	bool removeSharedFile(const TQString &szName,KviSharedFile * off);
 	void load(const TQString &filename);
diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/kvi_packagefile.cpp
index fa3a91d4..1a0d5088 100644
--- a/src/kvilib/file/kvi_packagefile.cpp
+++ b/src/kvilib/file/kvi_packagefile.cpp
@@ -98,7 +98,7 @@
 //   FieldData         Variable   FieldLen        The data of the field, see below for defined values
 
 // FieldData for FieldType 1 (file field)
-//   Flags             uint32     4               Bittqmask. Bits: 1=FileIsDeflated
+//   Flags             uint32     4               Bitmask. Bits: 1=FileIsDeflated
 //   Path              UniString  Variable        A relative path expressed as utf8 string. \ AND / are considered to be separators
 //   Size              uint32     4               Size of the following file data
 //   FilePayload       Bytes      Variable
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/kvi_avatarcache.cpp
index 57ab53f5..77578b17 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/kvi_avatarcache.cpp
@@ -76,11 +76,11 @@ KviAvatarCache::~KviAvatarCache()
 }
 
 
-void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork)
+void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 	
@@ -96,11 +96,11 @@ void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask
 	}
 }
 
-void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
+void KviAvatarCache::remove(const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 	
@@ -109,11 +109,11 @@ void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
 
 
 
-const TQString & KviAvatarCache::lookup(const KviIrcMask &tqmask,const TQString &szNetwork)
+const TQString & KviAvatarCache::lookup(const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 
diff --git a/src/kvilib/irc/kvi_avatarcache.h b/src/kvilib/irc/kvi_avatarcache.h
index c245c3bc..92f6a79f 100644
--- a/src/kvilib/irc/kvi_avatarcache.h
+++ b/src/kvilib/irc/kvi_avatarcache.h
@@ -55,9 +55,9 @@ public:
 	
 	static KviAvatarCache * instance(){ return m_pAvatarCacheInstance; };
 
-	void replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork);
-	void remove(const KviIrcMask &tqmask,const TQString &szNetwork);
-	const TQString & lookup(const KviIrcMask &tqmask,const TQString &szNetwork);
+	void replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork);
+	void remove(const KviIrcMask &mask,const TQString &szNetwork);
+	const TQString & lookup(const KviIrcMask &mask,const TQString &szNetwork);
 	
 	void cleanup();
 	
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
index d18e398d..4552cc93 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/kvi_ircmask.cpp
@@ -40,7 +40,7 @@
 		irc masks , nickname , username , hostname , wildcard
 	@body:
 		[big]Simple masks[/big][br]
-		An irc tqmask is a string in a special format that identifies an user on irc.[br]
+		An irc mask is a string in a special format that identifies an user on irc.[br]
 		The standard basic format is:[br]
 		[b]<nick>!<username>@<host>[/b][br]
 		The <nick> part contains the nickname with that the user is widely known across the network.[br]
@@ -81,7 +81,7 @@
 		The wild masks are used to "match" an user within a set of them.[br]
 		'*' matches any sequence (eventually empty) of characters and '?' matches a single character.[br]
 		Wildcards are allowed only in the <nick> , <user> and <host> part: so the
-		"wildest" tqmask possible is:[br]
+		"wildest" mask possible is:[br]
 		[b]*!*@*[/b][br]
 		that designates "any nickname, any username on any host".[br]
 		Here are some examples of wild masks:[br]
@@ -315,8 +315,8 @@ bool KviIrcMask::hasNumericHost() const
 
 
 /**
-* Retuns in szMask the specified (if possible) tqmask of this user.<br>
-* If the host or username are not known , the tqmask may contain less information
+* Retuns in szMask the specified (if possible) mask of this user.<br>
+* If the host or username are not known , the mask may contain less information
 * than requested.<br>
 * Mask types:<br>
 * 0 : nick!user@machine.host.top  (nick!user@XXX.XXX.XXX.XXX) (default)<br>
@@ -349,7 +349,7 @@ bool KviIrcMask::hasNumericHost() const
 * 25: nick!*user@*.host.top          (nick!*user@XXX.XXX.*)
 * 26: *!*user@*.host.top          (*!user@*XXX.XXX.*)
 * If some data is missing , these types may change:<br>
-* For example , if hostname is missing , the tqmask type 3 or 4 may be reduced to type 5
+* For example , if hostname is missing , the mask type 3 or 4 may be reduced to type 5
 */
 
 /*
@@ -365,10 +365,10 @@ bool KviIrcMask::hasNumericHost() const
 
 static unsigned char maskTable[27][3] = {
 	{ 0 , 0 , 0 }, //0 means normal block
-	{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host tqmask
+	{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host mask
 	{ 0 , 0 , 1 }, //2 in the second field means *user (strip prefixes)
 	{ 0 , 1 , 0 }, //1 means *
-	{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host tqmask
+	{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host mask
 	{ 0 , 1 , 1 }, //4 in the third field is like 3 but tries to detect masked ip addresses too
 	{ 1 , 0 , 0 },
 	{ 1 , 0 , 2 },
@@ -393,7 +393,7 @@ static unsigned char maskTable[27][3] = {
 	{ 1 , 2 , 4 }
 };
 
-void KviIrcMask::tqmask(TQString &szMask,MaskType eMaskType) const
+void KviIrcMask::mask(TQString &szMask,MaskType eMaskType) const
 {
 	if((((int)eMaskType) > 26)||(((int)eMaskType) < 0))eMaskType = NickUserHost;
 	szMask = maskTable[((int)eMaskType)][0] ? m_szWild : m_szNick;
@@ -556,25 +556,25 @@ bool KviIrcMask::matchedBy(const TQString &szMask) const
 }
 */
 
-bool KviIrcMask::matches(const KviIrcMask &tqmask) const
+bool KviIrcMask::matches(const KviIrcMask &mask) const
 {
-	if(KviTQString::matchWildExpressionsCI(m_szNick,tqmask.m_szNick))
+	if(KviTQString::matchWildExpressionsCI(m_szNick,mask.m_szNick))
 	{
-		if(KviTQString::matchWildExpressionsCI(m_szUser,tqmask.m_szUser))
+		if(KviTQString::matchWildExpressionsCI(m_szUser,mask.m_szUser))
 		{
-			if(KviTQString::matchWildExpressionsCI(m_szHost,tqmask.m_szHost))return true;
+			if(KviTQString::matchWildExpressionsCI(m_szHost,mask.m_szHost))return true;
 		}
 	}
 	return false;
 }
 
-bool KviIrcMask::matchesFixed(const KviIrcMask &tqmask) const
+bool KviIrcMask::matchesFixed(const KviIrcMask &mask) const
 {
-	if(KviTQString::matchStringCI(m_szNick,tqmask.m_szNick,0,1))
+	if(KviTQString::matchStringCI(m_szNick,mask.m_szNick,0,1))
 	{
-		if(KviTQString::matchStringCI(m_szUser,tqmask.m_szUser,0,1))
+		if(KviTQString::matchStringCI(m_szUser,mask.m_szUser,0,1))
 		{
-			if(KviTQString::matchStringCI(m_szHost,tqmask.m_szHost,0,1))return true;
+			if(KviTQString::matchStringCI(m_szHost,mask.m_szHost,0,1))return true;
 		}
 	}
 	return false;
@@ -609,7 +609,7 @@ bool KviIrcMask::matchesFixed(const TQString &nick,const TQString &user,const TQ
 	return true;
 }
 
-//Internals for tqmask()
+//Internals for mask()
 
 int KviIrcMask::getIpDomainMaskLen() const
 {
diff --git a/src/kvilib/irc/kvi_ircmask.h b/src/kvilib/irc/kvi_ircmask.h
index 4efac627..5566a424 100644
--- a/src/kvilib/irc/kvi_ircmask.h
+++ b/src/kvilib/irc/kvi_ircmask.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_irctqmask.h
+//   File : kvi_ircmask.h
 //   Creation date : Fri Jan 8 1999 19:50:35 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -33,7 +33,7 @@
 #include "kvi_qstring.h"
 
 //=============================================================================
-// Irc user tqmask abstraction
+// Irc user mask abstraction
 //=============================================================================
 
 class KVILIB_API KviIrcMask : public KviHeapObject
@@ -56,14 +56,14 @@ public:
 	// Sets the host for this user.<br>
 	// If szHost is NULL or it points to an empty string the host is set to "*".<br>
 	void setHost(const TQString &szHost){ m_szHost = szHost.isEmpty() ? m_szWild : szHost; };
-	// Sets the host , nick and username extracting it from an irc tqmask:<br>
+	// Sets the host , nick and username extracting it from an irc mask:<br>
 	// nick!user@host<br>
-	// The tqmask is terminated by end-of string null character or a character equal to c in the string.<br>
-	// Returns the pointer to the end of the tqmask in the szMask string.(c or null-terminator)<br>
+	// The mask is terminated by end-of string null character or a character equal to c in the string.<br>
+	// Returns the pointer to the end of the mask in the szMask string.(c or null-terminator)<br>
 	//const char * setMask(const TQString &szMask,char c=' ');
-	// Sets the host , nick and username extracting it from an userhost tqmask:<br>
+	// Sets the host , nick and username extracting it from an userhost mask:<br>
 	// nick[*]=<+|->user@host<br>
-	// The tqmask is terminated by end-of string null char or a space character.<br>
+	// The mask is terminated by end-of string null char or a space character.<br>
 	// Returns the pointer to the next non-space char in the szMask string or to the null-terminator<br>
 	// If there are no more masks avaiable.
 	// WARNING : the szMask pointer can NOT be NULL
@@ -80,8 +80,8 @@ public:
 	bool hasHost() const { return !(m_szHost.isEmpty() || (m_szHost == m_szWild)); };
 
 	bool hasNumericHost() const;
-	// Retuns in szMask the specified (if possible) tqmask of this user.<br>
-	// If the host or username are not known , the tqmask may contain less information
+	// Retuns in szMask the specified (if possible) mask of this user.<br>
+	// If the host or username are not known , the mask may contain less information
 	// than requested.<br>
 
 	enum MaskType
@@ -117,7 +117,7 @@ public:
 		CleanUserSmartNet = 26      // 26 : *!*user@*.host.top          (*!user@*XXX.XXX.*)
 	};
 	
-	void tqmask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
+	void mask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
 	bool hasWildNick();
 
 	// Wild external matches (this and external are wild)
@@ -125,24 +125,24 @@ public:
 //	bool matches(const char *szMask);
 //	// passing 0 as one of params here means that it is a match by default
 //	bool matches(const char *nick,const char *user,const char *host);
-	bool matches(const KviIrcMask &tqmask) const;
+	bool matches(const KviIrcMask &mask) const;
 
 
 	// Fixed external matches  (this is wild , external is fixed)
 	bool matchesFixed(const TQString &nick,const TQString &user,const TQString &host) const;
 //	bool matchesFixed(const TQString &szMask) const;
-	bool matchesFixed(const KviIrcMask &tqmask) const;
+	bool matchesFixed(const KviIrcMask &mask) const;
 
 	// Fixed internal matches (this is fixed , external is wild)
 	//bool matchedBy(const TQString &szMask) const;
-	bool matchedBy(const KviIrcMask &tqmask) const { return tqmask.matchesFixed(*this); };
+	bool matchedBy(const KviIrcMask &mask) const { return mask.matchesFixed(*this); };
 
 	int nonWildChars();
 	bool operator==(const KviIrcMask &user);
 public:
-	// Constructs an empty tqmask (*!*@*)
+	// Constructs an empty mask (*!*@*)
 	KviIrcMask();
-	// Constructs this KviIrcMask object from a string tqmask
+	// Constructs this KviIrcMask object from a string mask
 	KviIrcMask(const TQString &szMask);
 	// Carbon copy
 	KviIrcMask(const KviIrcMask &ircUser)
diff --git a/src/kvilib/irc/kvi_nickserv.h b/src/kvilib/irc/kvi_nickserv.h
index f259f1f5..5ed6bb43 100644
--- a/src/kvilib/irc/kvi_nickserv.h
+++ b/src/kvilib/irc/kvi_nickserv.h
@@ -36,10 +36,10 @@ class KVILIB_API KviNickServRule : public KviHeapObject
 {
 protected:
 	TQString m_szRegisteredNick;         // my registered nickname
-	TQString m_szNickServMask;           // the NickServ service tqmask
+	TQString m_szNickServMask;           // the NickServ service mask
 	TQString m_szMessageRegexp;          // the NickServ message regexp
 	TQString m_szIdentifyCommand;        // the IDENTIFY command to send to server
-	TQString m_szServerMask;             // the tqmask that the server must match (not used in per-network rules)
+	TQString m_szServerMask;             // the mask that the server must match (not used in per-network rules)
 public:
 	KviNickServRule() : KviHeapObject() {};
 	KviNickServRule(
diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h
index 6736a118..d29fefb0 100644
--- a/src/kvilib/system/kvi_locale.h
+++ b/src/kvilib/system/kvi_locale.h
@@ -129,7 +129,7 @@ class KVILIB_API KviTranslator : public TQTranslator
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KviTranslator(TQObject * tqparent,const char * name);
+		KviTranslator(TQObject * parent,const char * name);
 		~KviTranslator();
 	public:
 #ifdef COMPILE_USE_QT4
diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/kvi_tal_filedialog.cpp
index 5760a90c..f07df4c4 100644
--- a/src/kvilib/tal/kvi_tal_filedialog.cpp
+++ b/src/kvilib/tal/kvi_tal_filedialog.cpp
@@ -31,8 +31,8 @@
 
 	#include <tqdir.h>
 
-	KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
-	: TQFileDialog(tqparent,"",dirName,filter)
+	KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+	: TQFileDialog(parent,"",dirName,filter)
 	{
 		setModal(modal);
 	}
@@ -78,8 +78,8 @@
 
 	#ifdef COMPILE_KDE_SUPPORT
 	
-		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
-		: KFileDialog(dirName,filter,tqparent,name,modal)
+		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+		: KFileDialog(dirName,filter,parent,name,modal)
 		{
 			clearWFlags(WDestructiveClose);
 		}
@@ -129,8 +129,8 @@
 	
 		#include <tqdir.h>
 	
-		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *tqparent,const char *name,bool modal)
-		: TQFileDialog(dirName,filter,tqparent,name,modal)
+		KviTalFileDialog::KviTalFileDialog(const TQString &dirName,const TQString &filter,TQWidget *parent,const char *name,bool modal)
+		: TQFileDialog(dirName,filter,parent,name,modal)
 		{
 			clearWFlags(WDestructiveClose);
 		}
diff --git a/src/kvilib/tal/kvi_tal_filedialog_kde.h b/src/kvilib/tal/kvi_tal_filedialog_kde.h
index 5285aa16..3597f1a4 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_kde.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_kde.h
@@ -31,7 +31,7 @@ class KVILIB_API KviTalFileDialog : public KFileDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
 	~KviTalFileDialog();
 public:
 	enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -40,11 +40,11 @@ public:
 	void setDirectory(const TQString &szDirectory);
 
 
-	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
+	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
 	{ 
 		// TQFileDialog allows making new directories...kfiledialog not :/
-		return TQFileDialog::getExistingDirectory(dir,tqparent,0,caption);
-		//return getExistingDirectory(dir,tqparent,caption); 
+		return TQFileDialog::getExistingDirectory(dir,parent,0,caption);
+		//return getExistingDirectory(dir,parent,caption); 
 	};
 };
 
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt.h b/src/kvilib/tal/kvi_tal_filedialog_qt.h
index 0eebfc61..25dff95b 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_qt.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_qt.h
@@ -30,7 +30,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
 	~KviTalFileDialog();
 public:
 	enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -38,8 +38,8 @@ public:
 	void setFileMode(FileMode m);
 	void setDirectory(const TQString &szDirectory);
 
-	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
-		{ return getExistingDirectory(dir,tqparent,0 /* name */,caption); };
+	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
+		{ return getExistingDirectory(dir,parent,0 /* name */,caption); };
 };
 
 #endif // _KVI_TAL_FILEDIALOG_TQT_H_
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt4.h b/src/kvilib/tal/kvi_tal_filedialog_qt4.h
index 18bb420e..02586251 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_qt4.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_qt4.h
@@ -32,7 +32,7 @@ class KVILIB_API KviTalFileDialog : public TQFileDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *tqparent = 0,const char *name = 0,bool modal = FALSE);
+	KviTalFileDialog(const TQString &dirName,const TQString &filter = TQString(),TQWidget *parent = 0,const char *name = 0,bool modal = FALSE);
 	~KviTalFileDialog();
 public:
 	enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
@@ -40,8 +40,8 @@ public:
 	void setFileMode(FileMode m);
 	void setDirectory(const TQString &szDirectory);
 
-	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *tqparent = 0)
-		{ return getExistingDirectory(tqparent,caption,dir); };
+	static TQString getExistingDirectoryPath(const TQString &dir = TQString(),const TQString &caption = TQString(),TQWidget *parent = 0)
+		{ return getExistingDirectory(parent,caption,dir); };
 };
 
 #endif // _KVI_TAL_FILEDIALOG_TQT_H_
diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt3.h b/src/kvilib/tal/kvi_tal_groupbox_qt3.h
index 12369208..633d04ca 100644
--- a/src/kvilib/tal/kvi_tal_groupbox_qt3.h
+++ b/src/kvilib/tal/kvi_tal_groupbox_qt3.h
@@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public TQGroupBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalGroupBox(TQWidget * tqparent = 0)
-	: TQGroupBox(tqparent) {};
-	KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
-	: TQGroupBox(title,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
-	: TQGroupBox(strips,orientation,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
-	: TQGroupBox(strips,orientation,title,tqparent) {};
+	KviTalGroupBox(TQWidget * parent = 0)
+	: TQGroupBox(parent) {};
+	KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
+	: TQGroupBox(title,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
+	: TQGroupBox(strips,orientation,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
+	: TQGroupBox(strips,orientation,title,parent) {};
 	~KviTalGroupBox() {};
 };
 
diff --git a/src/kvilib/tal/kvi_tal_groupbox_qt4.h b/src/kvilib/tal/kvi_tal_groupbox_qt4.h
index 1b34de14..2e61356a 100644
--- a/src/kvilib/tal/kvi_tal_groupbox_qt4.h
+++ b/src/kvilib/tal/kvi_tal_groupbox_qt4.h
@@ -32,14 +32,14 @@ class KVILIB_API KviTalGroupBox : public Q3GroupBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTalGroupBox(TQWidget * tqparent = 0)
-	: Q3GroupBox(tqparent) {};
-	KviTalGroupBox(const TQString & title,TQWidget * tqparent = 0)
-	: Q3GroupBox(title,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * tqparent = 0)
-	: Q3GroupBox(strips,orientation,tqparent) {};
-	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * tqparent = 0)
-	: Q3GroupBox(strips,orientation,title,tqparent) {};
+	KviTalGroupBox(TQWidget * parent = 0)
+	: Q3GroupBox(parent) {};
+	KviTalGroupBox(const TQString & title,TQWidget * parent = 0)
+	: Q3GroupBox(title,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,TQWidget * parent = 0)
+	: Q3GroupBox(strips,orientation,parent) {};
+	KviTalGroupBox(int strips,Qt::Orientation orientation,const TQString & title,TQWidget * parent = 0)
+	: Q3GroupBox(strips,orientation,title,parent) {};
 	~KviTalGroupBox() {};
 };
 
diff --git a/src/kvilib/tal/kvi_tal_iconview_qt3.h b/src/kvilib/tal/kvi_tal_iconview_qt3.h
index 73d367c6..5ad9c07b 100644
--- a/src/kvilib/tal/kvi_tal_iconview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_iconview_qt3.h
@@ -79,18 +79,18 @@ public:
 class KVILIB_API KviTalIconViewItem : public TQIconViewItem
 {
 public:
-	KviTalIconViewItem(KviTalIconView * tqparent)
-	: TQIconViewItem(tqparent) {};
-	KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
-	: TQIconViewItem(tqparent,after) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
-	: TQIconViewItem(tqparent,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
-	: TQIconViewItem(tqparent,after,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
-	: TQIconViewItem(tqparent,text,icon) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
-	: TQIconViewItem(tqparent,after,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent)
+	: TQIconViewItem(parent) {};
+	KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
+	: TQIconViewItem(parent,after) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
+	: TQIconViewItem(parent,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
+	: TQIconViewItem(parent,after,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
+	: TQIconViewItem(parent,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
+	: TQIconViewItem(parent,after,text,icon) {};
 public:
 	KviTalIconView * iconView() const { return (KviTalIconView *)TQIconViewItem::iconView(); };
 	KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)TQIconViewItem::prevItem(); };
diff --git a/src/kvilib/tal/kvi_tal_iconview_qt4.h b/src/kvilib/tal/kvi_tal_iconview_qt4.h
index 99554341..33a5bef4 100644
--- a/src/kvilib/tal/kvi_tal_iconview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_iconview_qt4.h
@@ -78,18 +78,18 @@ public:
 class KVILIB_API KviTalIconViewItem : public Q3IconViewItem
 {
 public:
-	KviTalIconViewItem(KviTalIconView * tqparent)
-	: Q3IconViewItem(tqparent) {};
-	KviTalIconViewItem(KviTalIconView * tqparent,KviTalIconViewItem * after)
-	: Q3IconViewItem(tqparent,after) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text)
-	: Q3IconViewItem(tqparent,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text)
-	: Q3IconViewItem(tqparent,after,text) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, const TQString & text, const TQPixmap & icon)
-	: Q3IconViewItem(tqparent,text,icon) {};
-	KviTalIconViewItem(KviTalIconView * tqparent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
-	: Q3IconViewItem(tqparent,after,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent)
+	: Q3IconViewItem(parent) {};
+	KviTalIconViewItem(KviTalIconView * parent,KviTalIconViewItem * after)
+	: Q3IconViewItem(parent,after) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text)
+	: Q3IconViewItem(parent,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text)
+	: Q3IconViewItem(parent,after,text) {};
+	KviTalIconViewItem(KviTalIconView * parent, const TQString & text, const TQPixmap & icon)
+	: Q3IconViewItem(parent,text,icon) {};
+	KviTalIconViewItem(KviTalIconView * parent, KviTalIconViewItem * after, const TQString & text, const TQPixmap & icon)
+	: Q3IconViewItem(parent,after,text,icon) {};
 public:
 	KviTalIconView * iconView() const { return (KviTalIconView *)Q3IconViewItem::iconView(); };
 	KviTalIconViewItem * prevItem() const { return (KviTalIconViewItem *)Q3IconViewItem::prevItem(); };
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index f7c31719..2d946a21 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -69,8 +69,8 @@
 	            lvi.features |= TQStyleOptionQ3ListViewItem::MultiLine;
 	        if (item->isVisible())
 	            lvi.features |= TQStyleOptionQ3ListViewItem::Visible;
-	        if (item->tqparent() && item->tqparent()->rtti() == 1
-	            && static_cast<Q3CheckListItem *>(item->tqparent())->type() == Q3CheckListItem::Controller)
+	        if (item->parent() && item->parent()->rtti() == 1
+	            && static_cast<Q3CheckListItem *>(item->parent())->type() == Q3CheckListItem::Controller)
 	            lvi.features |= TQStyleOptionQ3ListViewItem::ParentControl;
 	        opt.items.append(lvi);
 	        if (!firstItem) {
@@ -210,39 +210,39 @@
 	    bool tristate;
 	};
 
-	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
 	                                Type tt)
-	    : KviTalListViewItem(tqparent, text, TQString())
+	    : KviTalListViewItem(parent, text, TQString())
 	{
 	    myType = tt;
 	    init();
 	    if (myType == RadioButton) {
-	        if (tqparent->type() != RadioButtonController)
+	        if (parent->type() != RadioButtonController)
 	            qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 	                      "child of a controller");
 	        else
-	            d->exclusive = tqparent;
+	            d->exclusive = parent;
 	    }
 	}
 
-	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
 	                                const TQString &text, Type tt)
-	    : KviTalListViewItem(tqparent, after, text)
+	    : KviTalListViewItem(parent, after, text)
 	{
 	    myType = tt;
 	    init();
 	    if (myType == RadioButton) {
-	        if (tqparent->type() != RadioButtonController)
+	        if (parent->type() != RadioButtonController)
 	            qWarning("KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 	                      "child of a controller");
 	        else
-	            d->exclusive = tqparent;
+	            d->exclusive = parent;
 	    }
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
 	                                Type tt)
-	    : KviTalListViewItem(tqparent, text, TQString())
+	    : KviTalListViewItem(parent, text, TQString())
 	{
 	    myType = tt;
 	    if (myType == RadioButton) {
@@ -252,9 +252,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
 	                                const TQString &text, Type tt)
-	    : KviTalListViewItem(tqparent, after, text)
+	    : KviTalListViewItem(parent, after, text)
 	{
 	    myType = tt;
 	    if (myType == RadioButton) {
@@ -264,9 +264,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
 	                                Type tt)
-	    : KviTalListViewItem(tqparent, text)
+	    : KviTalListViewItem(parent, text)
 	{
 	    myType = tt;
 	    if (tt == RadioButton)
@@ -275,9 +275,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
 	                                const TQString &text, Type tt)
-	    : KviTalListViewItem(tqparent, after, text)
+	    : KviTalListViewItem(parent, after, text)
 	{
 	    myType = tt;
 	    if (tt == RadioButton)
@@ -291,18 +291,18 @@
 	    return RTTI;
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListView *parent, const TQString &text,
 	                                const TQPixmap & p)
-	    : KviTalListViewItem(tqparent, text)
+	    : KviTalListViewItem(parent, text)
 	{
 	    myType = RadioButtonController;
 	    setPixmap(0, p);
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
 	                                const TQPixmap & p)
-	    : KviTalListViewItem(tqparent, text)
+	    : KviTalListViewItem(parent, text)
 	{
 	    myType = RadioButtonController;
 	    setPixmap(0, p);
@@ -373,9 +373,9 @@
 	    if (myType == CheckBox) {
 	        setCurrentState(s);
 	        stateChange(state());
-	        if (update && tqparent() && tqparent()->rtti() == 1
-	             && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	            ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+	        if (update && parent() && parent()->rtti() == 1
+	             && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	            ((KviTalCheckListItem*)parent())->updateController(update, store);
 	    } else if (myType == CheckBoxController) {
 	        if (s == NoChange && childCount()) {
 	            restoreState(this);
@@ -397,18 +397,18 @@
 	                    ToggleState oldState = internalState();
 	                    updateController(false, false);
 	                    if (oldState != internalState() &&
-	                         tqparent() && tqparent()->rtti() == 1 &&
-	                         ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	                        ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+	                         parent() && parent()->rtti() == 1 &&
+	                         ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	                        ((KviTalCheckListItem*)parent())->updateController(update, store);
 	
 	                        updateController(update, store);
 	                } else {
-	                    // if there are no tqchildren we simply set the CheckBoxController and update its tqparent
+	                    // if there are no tqchildren we simply set the CheckBoxController and update its parent
 	                    setCurrentState(s);
 	                    stateChange(state());
-	                    if (tqparent() && tqparent()->rtti() == 1
-	                         && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	                        ((KviTalCheckListItem*)tqparent())->updateController(update, store);
+	                    if (parent() && parent()->rtti() == 1
+	                         && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	                        ((KviTalCheckListItem*)parent())->updateController(update, store);
 	                }
 	            } else {
 	                setCurrentState(s);
@@ -482,8 +482,8 @@
 	    int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
 	    if (activatedPos(pos)) {
 	        bool parentControl = false;
-	        if (tqparent() && tqparent()->rtti() == 1  &&
-	            ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+	        if (parent() && parent()->rtti() == 1  &&
+	            ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
 	            parentControl = true;
 	
 	        int x = parentControl ? 0 : 3;
@@ -588,10 +588,10 @@
 	        return;
 	
 	    KviTalCheckListItem *controller = 0;
-	    // checks if this CheckBoxController has another CheckBoxController as tqparent
-	    if (tqparent() && tqparent()->rtti() == 1
-	         && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController)
-	        controller = (KviTalCheckListItem*)tqparent();
+	    // checks if this CheckBoxController has another CheckBoxController as parent
+	    if (parent() && parent()->rtti() == 1
+	         && ((KviTalCheckListItem*)parent())->type() == CheckBoxController)
+	        controller = (KviTalCheckListItem*)parent();
 	
 	    ToggleState theState = Off;
 	    bool first = true;
@@ -695,8 +695,8 @@
 	    }
 	
 	    bool parentControl = false;
-	    if (tqparent() && tqparent()->rtti() == 1  &&
-	         ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+	    if (parent() && parent()->rtti() == 1  &&
+	         ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
 	        parentControl = true;
 	
 	    TQFontMetrics fm(lv->fontMetrics());
@@ -775,8 +775,8 @@
 	        intersect = r.intersects(TQRect(p, r.y(), xdepth - p + 1, r.height()));
 	    }
 	    bool parentControl = false;
-	    if (tqparent() && tqparent()->rtti() == 1  &&
-	         ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
+	    if (parent() && parent()->rtti() == 1  &&
+	         ((KviTalCheckListItem*) parent())->type() == RadioButtonController)
 	        parentControl = true;
 	    if (myType != RadioButtonController && intersect &&
 	         (lv->rootIsDecorated() || myType == RadioButton ||
@@ -935,39 +935,39 @@
 	
 	// ### obscenity is warranted.
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, const TQString &text,
 					Type tt )
-	    : KviTalListViewItem( tqparent, text, TQString() )
+	    : KviTalListViewItem( parent, text, TQString() )
 	{
 	    myType = tt;
 	    init();
 	    if ( myType == RadioButton ) {
-		if ( tqparent->type() != RadioButtonController )
+		if ( parent->type() != RadioButtonController )
 		    qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 			      "child of a controller" );
 		else
-		    d->exclusive = tqparent;
+		    d->exclusive = parent;
 	    }
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalCheckListItem *parent, KviTalListViewItem *after,
 	 				const TQString &text, Type tt )
-	    : KviTalListViewItem( tqparent, after, text )
+	    : KviTalListViewItem( parent, after, text )
 	{
 	    myType = tt;
 	    init();
 	    if ( myType == RadioButton ) {
-	 	if ( tqparent->type() != RadioButtonController )
+	 	if ( parent->type() != RadioButtonController )
 	 	    qWarning( "KviTalCheckListItem::KviTalCheckListItem(), radio button must be "
 			      "child of a controller" );
 	 	else
-	 	    d->exclusive = tqparent;
+	 	    d->exclusive = parent;
 	    }
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
 					Type tt )
-	    : KviTalListViewItem( tqparent, text, TQString() )
+	    : KviTalListViewItem( parent, text, TQString() )
 	{
 	    myType = tt;
 	    if ( myType == RadioButton ) {
@@ -977,9 +977,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,
 	 				const TQString &text, Type tt )
-	    : KviTalListViewItem( tqparent, after, text )
+	    : KviTalListViewItem( parent, after, text )
 	{
 	    myType = tt;
 	    if ( myType == RadioButton ) {
@@ -989,9 +989,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
 					Type tt )
-	    : KviTalListViewItem( tqparent, text )
+	    : KviTalListViewItem( parent, text )
 	{
 	    myType = tt;
 	    if ( tt == RadioButton )
@@ -1000,9 +1000,9 @@
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,
 	 				const TQString &text, Type tt )
-	    : KviTalListViewItem( tqparent, after, text )
+	    : KviTalListViewItem( parent, after, text )
 	{
 	    myType = tt;
 	    if ( tt == RadioButton )
@@ -1019,18 +1019,18 @@
 	    return RTTI;
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListView *parent, const TQString &text,
 					const TQPixmap & p )
-	    : KviTalListViewItem( tqparent, text )
+	    : KviTalListViewItem( parent, text )
 	{
 	    myType = RadioButtonController;
 	    setPixmap( 0, p );
 	    init();
 	}
 	
-	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,
+	KviTalCheckListItem::KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,
 					const TQPixmap & p )
-	    : KviTalListViewItem( tqparent, text )
+	    : KviTalListViewItem( parent, text )
 	{
 	    myType = RadioButtonController;
 	    setPixmap( 0, p );
@@ -1107,9 +1107,9 @@
 	    if ( myType == CheckBox ) {
 		setCurrentState( s );
 		stateChange( state() );
-	  	if ( update && tqparent() && tqparent()->rtti() == 1
-	  	     && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-	  	    ((KviTalCheckListItem*)tqparent())->updateController( update, store );
+	  	if ( update && parent() && parent()->rtti() == 1
+	  	     && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+	  	    ((KviTalCheckListItem*)parent())->updateController( update, store );
 	    } else if ( myType == CheckBoxController ) {
 		if ( s == NoChange && childCount()) {
 		    restoreState( (void*) this );
@@ -1131,18 +1131,18 @@
 			    ToggleState oldState = internalState();
 			    updateController( FALSE, FALSE );
 			    if ( oldState != internalState() &&
-				 tqparent() && tqparent()->rtti() == 1 &&
-				 ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-				((KviTalCheckListItem*)tqparent())->updateController( update, store );
+				 parent() && parent()->rtti() == 1 &&
+				 ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+				((KviTalCheckListItem*)parent())->updateController( update, store );
 	
 				updateController( update, store );
 			} else {
-			    // if there are no tqchildren we simply set the CheckBoxController and update its tqparent
+			    // if there are no tqchildren we simply set the CheckBoxController and update its parent
 			    setCurrentState( s );
 			    stateChange( state() );
-			    if ( tqparent() && tqparent()->rtti() == 1
-				 && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-				((KviTalCheckListItem*)tqparent())->updateController( update, store );
+			    if ( parent() && parent()->rtti() == 1
+				 && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+				((KviTalCheckListItem*)parent())->updateController( update, store );
 			}
 		    } else {
 			setCurrentState( s );
@@ -1219,8 +1219,8 @@
 	    int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
 	    if ( activatedPos( pos ) ) {
 		bool parentControl = FALSE;
-		if ( tqparent() && tqparent()->rtti() == 1  &&
-		    ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+		if ( parent() && parent()->rtti() == 1  &&
+		    ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
 		    parentControl = TRUE;
 	
 		int x = parentControl ? 0 : 3;
@@ -1324,10 +1324,10 @@
 		return;
 	
 	    KviTalCheckListItem *controller = 0;
-	    // checks if this CheckBoxController has another CheckBoxController as tqparent
-	    if ( tqparent() && tqparent()->rtti() == 1
-		 && ((KviTalCheckListItem*)tqparent())->type() == CheckBoxController )
-		controller = (KviTalCheckListItem*)tqparent();
+	    // checks if this CheckBoxController has another CheckBoxController as parent
+	    if ( parent() && parent()->rtti() == 1
+		 && ((KviTalCheckListItem*)parent())->type() == CheckBoxController )
+		controller = (KviTalCheckListItem*)parent();
 	
 	    ToggleState theState = Off;
 	    bool first = TRUE;
@@ -1432,8 +1432,8 @@
 	    }
 	
 	    bool parentControl = FALSE;
-	    if ( tqparent() && tqparent()->rtti() == 1  &&
-		 ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+	    if ( parent() && parent()->rtti() == 1  &&
+		 ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
 		parentControl = TRUE;
 	
 	    TQFontMetrics fm( lv->fontMetrics() );
@@ -1512,8 +1512,8 @@
 		intersect = r.intersects( TQRect( p, r.y(), xdepth - p + 1, r.height() ) );
 	    }
 	    bool parentControl = FALSE;
-	    if ( tqparent() && tqparent()->rtti() == 1  &&
-		 ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
+	    if ( parent() && parent()->rtti() == 1  &&
+		 ((KviTalCheckListItem*) parent())->type() == RadioButtonController )
 		parentControl = TRUE;
 	    if ( myType != RadioButtonController && intersect &&
 		 (lv->rootIsDecorated() || myType == RadioButton ||
diff --git a/src/kvilib/tal/kvi_tal_listview_qt3.h b/src/kvilib/tal/kvi_tal_listview_qt3.h
index 75b062a4..cf72e9ff 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt3.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt3.h
@@ -113,7 +113,7 @@ public:
 	// Shadow the internal TQt methods
 	KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)TQListViewItem::firstChild(); };
 	KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)TQListViewItem::nextSibling(); };
-	KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)TQListViewItem::tqparent(); };
+	KviTalListViewItem * parent() const { return (KviTalListViewItem *)TQListViewItem::parent(); };
 	KviTalListView * listView() const { return (KviTalListView *)TQListViewItem::listView(); };
 	KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)TQListViewItem::itemAbove(); };
 	KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)TQListViewItem::itemBelow(); };
@@ -133,14 +133,14 @@ public:
 	};
 	enum ToggleState { Off, NoChange, On };
 
-	KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,Type = RadioButtonController);
-	KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
-	KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListViewItem *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListView *tqparent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
-	KviTalCheckListItem( KviTalListViewItem *tqparent, const TQString &text,const TQPixmap & );
-	KviTalCheckListItem( KviTalListView *tqparent, const TQString &text,const TQPixmap & );
+	KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,Type = RadioButtonController);
+	KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController);
+	KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListViewItem *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListView *parent, const TQString &text,Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListView *parent, KviTalListViewItem *after,const TQString &text, Type = RadioButtonController );
+	KviTalCheckListItem( KviTalListViewItem *parent, const TQString &text,const TQPixmap & );
+	KviTalCheckListItem( KviTalListView *parent, const TQString &text,const TQPixmap & );
 	~KviTalCheckListItem();
 
 	void paintCell( TQPainter *,const TQColorGroup & cg,int column, int width, int tqalignment );
diff --git a/src/kvilib/tal/kvi_tal_listview_qt4.h b/src/kvilib/tal/kvi_tal_listview_qt4.h
index d6f2bba6..83e46869 100644
--- a/src/kvilib/tal/kvi_tal_listview_qt4.h
+++ b/src/kvilib/tal/kvi_tal_listview_qt4.h
@@ -114,7 +114,7 @@ public:
 	// Shadow the internal TQt methods
 	KviTalListViewItem * firstChild() const { return (KviTalListViewItem *)Q3ListViewItem::firstChild(); };
 	KviTalListViewItem * nextSibling() const { return (KviTalListViewItem *)Q3ListViewItem::nextSibling(); };
-	KviTalListViewItem * tqparent() const { return (KviTalListViewItem *)Q3ListViewItem::tqparent(); };
+	KviTalListViewItem * parent() const { return (KviTalListViewItem *)Q3ListViewItem::parent(); };
 	KviTalListView * listView() const { return (KviTalListView *)Q3ListViewItem::listView(); };
 	KviTalListViewItem * itemAbove() { return (KviTalListViewItem *)Q3ListViewItem::itemAbove(); };
 	KviTalListViewItem * itemBelow() { return (KviTalListViewItem *)Q3ListViewItem::itemBelow(); };
@@ -133,21 +133,21 @@ public:
 
     enum ToggleState { Off, NoChange, On };
 
-    KviTalCheckListItem(KviTalCheckListItem *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalCheckListItem *parent, const TQString &text,
                     Type = RadioButtonController);
-    KviTalCheckListItem(KviTalCheckListItem *tqparent, KviTalListViewItem *after,
+    KviTalCheckListItem(KviTalCheckListItem *parent, KviTalListViewItem *after,
                     const TQString &text, Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
                     Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListViewItem *tqparent, KviTalListViewItem *after,
+    KviTalCheckListItem(KviTalListViewItem *parent, KviTalListViewItem *after,
                     const TQString &text, Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListView *parent, const TQString &text,
                     Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListView *tqparent, KviTalListViewItem *after,
+    KviTalCheckListItem(KviTalListView *parent, KviTalListViewItem *after,
                     const TQString &text, Type = RadioButtonController);
-    KviTalCheckListItem(KviTalListViewItem *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListViewItem *parent, const TQString &text,
                     const TQPixmap &);
-    KviTalCheckListItem(KviTalListView *tqparent, const TQString &text,
+    KviTalCheckListItem(KviTalListView *parent, const TQString &text,
                     const TQPixmap &);
     ~KviTalCheckListItem();