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/kvirc@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

100 files changed, 337 insertions, 337 deletions

diff --git a/src/kvilib/core/kvi_error.cpp b/src/kvilib/core/kvi_error.cpp
index bbd1abcd..2786984b 100644
--- a/src/kvilib/core/kvi_error.cpp
+++ b/src/kvilib/core/kvi_error.cpp
@@ -57,7 +57,7 @@ const char * g_errorTable[KVI_NUM_ERRORS]=
 	__tr_no_lookup("Unexpected end of command in dictionary key"),              // 006: unexpectedEndInDictionaryKey
 	__tr_no_lookup("Switch dash without switch letter"),                        // 007: switchDashWithoutSwitchLetter
 	__tr_no_lookup("Unknown function"),                                         // 008: unknownFunction
-	__tr_no_lookup("Unexpected end of command in tqparenthesis"),                 // 009: unexpectedEndInParenthesis
+	__tr_no_lookup("Unexpected end of command in parenthesis"),                 // 009: unexpectedEndInParenthesis
 	__tr_no_lookup("Unexpected end of command in function parameters"),         // 010: unexpectedEndInFunctionParams
 	__tr_no_lookup("Missing variable name"),                                    // 011: missingVariableName
 	__tr_no_lookup("Variable or identifier expected"),                          // 012: variableOrIdentifierExpected
@@ -112,7 +112,7 @@ const char * g_errorTable[KVI_NUM_ERRORS]=
 	__tr_no_lookup("Integer parameter expected"),                               // 061
 	__tr_no_lookup("Invalid parameter"),                                        // 062
 	__tr_no_lookup("No such file"),                                             // 063
-	__tr_no_lookup("Open tqparenthesis expected"),                                // 064
+	__tr_no_lookup("Open parenthesis expected"),                                // 064
 	__tr_no_lookup("Open brace expected"),                                      // 065
 	__tr_no_lookup("Can't kill a builtin class"),                               // 066
 	__tr_no_lookup("The SOCKSV4 protocol lacks IpV6 support"),                  // 067
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
index 4a9b20d8..dceceeda 100644
--- a/src/kvilib/core/kvi_pointerhashtable.h
+++ b/src/kvilib/core/kvi_pointerhashtable.h
@@ -681,7 +681,7 @@ public:
 	/// Removes all items in the hash table and then
 	/// makes a complete shallow copy of the data contained in t.
 	/// The removed items are deleted if autodeletion is enabled.
-	/// The hash table iterator is tqinvalidated.
+	/// The hash table iterator is invalidated.
 	/// Does not change autodelete flag: make sure you not delete the items twice :)
 	///
 	void copyFrom(KviPointerHashTable<Key,T> &t)
@@ -693,7 +693,7 @@ public:
 
 	///
 	/// Inserts a complete shallow copy of the data contained in t.
-	/// The hash table iterator is tqinvalidated.
+	/// The hash table iterator is invalidated.
 	///
 	void insert(KviPointerHashTable<Key,T> &t)
 	{
diff --git a/src/kvilib/core/kvi_pointerlist.h b/src/kvilib/core/kvi_pointerlist.h
index 8b5cb9c5..2051036c 100644
--- a/src/kvilib/core/kvi_pointerlist.h
+++ b/src/kvilib/core/kvi_pointerlist.h
@@ -630,7 +630,7 @@ public:
 	/// A call to this function should be preceded by a call to
 	/// first(),last(),at() or tqfindRef().
 	/// This function will return a NULL pointer if the current
-	/// item has been tqinvalidated due to a remove operation.
+	/// item has been invalidated due to a remove operation.
 	///
 	T * safeCurrent()
 	{
diff --git a/src/kvilib/core/kvi_qstring.h b/src/kvilib/core/kvi_qstring.h
index d5addebf..dc75deb0 100644
--- a/src/kvilib/core/kvi_qstring.h
+++ b/src/kvilib/core/kvi_qstring.h
@@ -249,7 +249,7 @@ namespace KviTQString
 
 	// WARNING: DO NOT USE CONSTRUCTS LIKE char * c = KviTQString::toUtf8(something).data();
 	//          They are dangerous since with many compilers the returned string gets destroyed
-	//          at the end of the instruction and the c pointer gets thus tqinvalidated.
+	//          at the end of the instruction and the c pointer gets thus invalidated.
 	//          Use
 	//           KviTQCString tmp = KviTQString::toUtf8(something);
 	//           char * c = tmp.data(); 
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index 36cc6dfc..4601e6bd 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -129,7 +129,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 	int iWildCount    = m->szFileMask.occurences('*');
 	int iNonWildCount = m->szFileMask.len() - iWildCount;
 
-	// The tqmasks with no wildcards go first in the list
+	// The masks with no wildcards go first in the list
 	// then we insert the ones with more non-wild chars
 
 	int index = 0;
@@ -172,7 +172,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 				return;
 			}
 			// the current one has no wildcards...
-			// the longer tqmasks go first....
+			// the longer masks go first....
 			if(mt->szFileMask.len() < m->szFileMask.len())
 			{
 				// the current one is shorter than the new one...insert
@@ -185,8 +185,8 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 	m_pMediaTypeList->append(m);
 
 /*
-	// the tqmasks with no wildcards go first
-	// longer tqmasks go first
+	// the masks with no wildcards go first
+	// longer masks go first
 
 	bool bHasWildcards = m->szFileMask.tqcontains('*');
 	int index = 0;
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index c60d2c9e..0a0c632a 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -47,7 +47,7 @@
 	@body:
 		[big]Introduction[/big][br]
 		The "registered user database" is basically a set of users with associated
-		[doc:irc_tqmasks]irc-tqmasks[/doc] and properties.[br]
+		[doc:irc_masks]irc-masks[/doc] and properties.[br]
 		It is used to recognize users on IRC and associate properties to them.[br]
 		This works more or less like the IRC ban list, K-Line list, or invite list.[br]
 		[big]User entry[/big][br]
@@ -55,20 +55,20 @@
 		It may be the nickname of the user that you want to match, or the real name (if you know it)
 		or any other string (even with spaces). The name is an "internal identifier" for the user entry:
 		each name maps to a single entry and each entry has a single name.[br]
-		Each entry has a set of registration [doc:irc_tqmasks]irc-tqmasks[/doc]: these tqmasks
+		Each entry has a set of registration [doc:irc_masks]irc-masks[/doc]: these masks
 		are used to recognize the user on irc.[br]
 		[br]
-		[big]Registration tqmasks[/big][br]
-		The tqmasks have the common IRC tqmask format: [b]<nick>!<user>@<host>[/b][br]
-		The tqmasks may contain '*' and '?' wildcards that match any portion of text.[br]
+		[big]Registration masks[/big][br]
+		The masks have the common IRC tqmask 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]
 		[b]*!~daemon@*[/b][br]
 		[b]Pragma!*daemon@*.it[/b][br]
 		[b]Pragma!?daemon@some*.it[/b][br]
 		[b][email protected][/b][br]
-		Are examples of valid registration tqmasks.[br]
-		The tqmasks with wildcards can actually match more than a single user.[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
 		having root as username and coming from the host.com domain.[br]
 		For this reason putting wildcards in nicknames could become a problem
@@ -88,7 +88,7 @@
 		<variable-number>.somewhere.in.time.org.[br]
 		You will add an entry with name "Derek Riggs" and a registration tqmask like the following:
 		Eddie!stranger@*.somewhere.in.time.org.[br]
-		If the IRC servers keep adding strange characters ([doc:irc_tqmasks]prefixes[/doc]) at the beginning of his username you may use
+		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:
 		Eddie!*eddie@*.wasted.years.org.[br]
@@ -98,7 +98,7 @@
 		and you're implementing an auto-kick system, the correct tqmask 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 tqmasks registered: Pragma!*xor@*.myisp.it and *!*@*.myisp.it,
+		If you have two masks registered: Pragma!*xor@*.myisp.it and *!*@*.myisp.it,
 		kvirc will match [email protected] with the first one even if the second
 		one matches too; the firs one is a best match.[br]
 		[br]
@@ -117,7 +117,7 @@
 		[br]
 		[big]The interface to the database[/big][br]
 		The [module:reguser]reguser module[/module] is the interface to the "registered users database".[br]
-		It provides a set of commands for adding and removing tqmasks and manipulating properties.[br]
+		It provides a set of commands for adding and removing masks and manipulating properties.[br]
 */
 
 //============================================================================================================
@@ -359,7 +359,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::getUser(const TQString & name)
 	return u;
 }
 
-static void append_tqmask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *tqmask)
+static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,KviIrcMask *tqmask)
 {
 	KviRegisteredMask * newMask = new KviRegisteredMask(u,tqmask);
 	int idx = 0;
@@ -393,7 +393,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
 			}
 		}
 		// not found ...ok... add it
-		// tqmasks with more info go first in the list
+		// masks with more info go first in the list
 		l = m_pWildMaskList;
 	} else {
 		l = m_pMaskDict->tqfind(tqmask->nick());
@@ -421,7 +421,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
 				delete l;
                 l = 0;
 			} else {
-				append_tqmask_to_list(l,u,tqmask);
+				append_mask_to_list(l,u,tqmask);
 				m_pMaskDict->insert(tqmask->nick(),l);
 			}
 			return 0;
@@ -433,7 +433,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
 		debug("ops...got an incoherent regusers action...recovered ?");
 		return 0; // ops...already there ?
 	}
-	append_tqmask_to_list(l,u,tqmask);
+	append_mask_to_list(l,u,tqmask);
 	return 0;
 }
 
@@ -450,8 +450,8 @@ void KviRegisteredUserDataBase::copyFrom(KviRegisteredUserDataBase * db)
 	while(KviRegisteredUser * theCur = it.current())
 	{
 		KviRegisteredUser * u = getUser(theCur->name());
-		// copy tqmasks
-		KviPointerList<KviIrcMask> * l = theCur->tqmaskList();
+		// copy masks
+		KviPointerList<KviIrcMask> * l = theCur->maskList();
 		for(KviIrcMask * m=l->first();m;m = l->next())
 		{
 			KviIrcMask * m2 = new KviIrcMask(*m);
@@ -488,7 +488,7 @@ bool KviRegisteredUserDataBase::removeUser(const TQString & name)
 	if(name.isEmpty()) return false;
 	KviRegisteredUser * u = m_pUserDict->tqfind(name);
 	if(!u)return false;
-	while(KviIrcMask * tqmask = u->tqmaskList()->first())
+	while(KviIrcMask * tqmask = u->maskList()->first())
 	{
 		if(!removeMaskByPointer(tqmask))
 			debug("Ops... removeMaskByPointer(%s) failed ?",KviTQString::toUtf8(name).data());
@@ -565,7 +565,7 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
 /*
 KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &tqmask)
 {
-	// first lookup the nickname in the tqmaskDict
+	// first lookup the nickname in the maskDict
 	KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask.nick());
 	if(l)
 	{
@@ -591,7 +591,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const TQString &
 
 KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString & nick,const TQString &user,const TQString & host)
 {
-	// first lookup the nickname in the tqmaskDict
+	// first lookup the nickname in the maskDict
 	if(nick.isEmpty()) return false;
 	KviRegisteredMaskList * l = m_pMaskDict->tqfind(nick);
 	if(l)
@@ -618,7 +618,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::findUserWithMask(const KviIrcMask
 
 KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &tqmask)
 {
-	// first lookup the nickname in the tqmaskDict
+	// first lookup the nickname in the maskDict
 	if(tqmask.nick()=="") return 0;
 	KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask.nick());
 	if(l)
@@ -672,7 +672,7 @@ void KviRegisteredUserDataBase::load(const TQString & filename)
 					{
 						tmp.remove(0,5);
 						u->setProperty(tmp,*(sdi.current()));
-					} else if(KviTQString::equalCSN("tqmask_",tmp,5))
+					} else if(KviTQString::equalCSN("mask_",tmp,5))
 					{
 						KviIrcMask * tqmask = new KviIrcMask(*(sdi.current()));
 						addMask(u,tqmask);
@@ -716,12 +716,12 @@ void KviRegisteredUserDataBase::save(const TQString & filename)
 				++pit;
 			}
 		}
-		// Write tqmasks
+		// Write masks
 		int idx = 0;
-		for(KviIrcMask * m = it.current()->tqmaskList()->first();m;m = it.current()->tqmaskList()->next())
+		for(KviIrcMask * m = it.current()->maskList()->first();m;m = it.current()->maskList()->next())
 		{
 			TQString tmp;
-			KviTQString::sprintf(tmp,"tqmask_%d",idx);
+			KviTQString::sprintf(tmp,"mask_%d",idx);
 			TQString tqmask;
 			m->tqmask(tqmask,KviIrcMask::NickUserHost);
 			cfg.writeEntry(tmp,tqmask);
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h
index 0cfd6c71..78e193de 100644
--- a/src/kvilib/ext/kvi_regusersdb.h
+++ b/src/kvilib/ext/kvi_regusersdb.h
@@ -72,7 +72,7 @@ private:
 	TQString                    m_szName;
 	TQString					   m_szGroup;
 	KviPointerHashTable<TQString,TQString>           * m_pPropertyDict;   // owned properties
-	KviPointerList<KviIrcMask>     * m_pMaskList;       // owned tqmasks
+	KviPointerList<KviIrcMask>     * m_pMaskList;       // owned masks
 protected:
 	// tqmask ownership is transferred! (always!) returns false if the tqmask was already there
 	bool addMask(KviIrcMask * tqmask);
@@ -101,8 +101,8 @@ public:
 	bool getBoolProperty(const TQString &name,bool def=FALSE);           // returns true if the property is there and is true
 	// the propertyDict may be 0!
 	KviPointerHashTable<TQString,TQString> * propertyDict(){ return m_pPropertyDict; };
-	// this is never zero (but may contain no tqmasks)
-	KviPointerList<KviIrcMask> * tqmaskList(){ return m_pMaskList; };
+	// this is never zero (but may contain no masks)
+	KviPointerList<KviIrcMask> * maskList(){ return m_pMaskList; };
 };
 
 //============================================================================================================
@@ -149,7 +149,7 @@ typedef KviPointerList<KviRegisteredMask> KviRegisteredMaskList;
 // KviRegisteredUsersDb
 //
 //    Manages a set of KviRegisteredUser instances stored in the m_pUserDict dictionary
-//    The users are identified by tqmasks stored in m_pMaskDict and m_pWildMaskList
+//    The users are identified by masks stored in m_pMaskDict and m_pWildMaskList
 //    m_pMaskDict contains lists of non wild-nick KviRegisteredMask that point to users
 //    m_pWildMaskList is a list of wild-nick KviRegisteredMask that point to users
 //
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index b3c96e11..9383f695 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -208,8 +208,8 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
 				return;
 			}
 			// the current one has no wildcards...
-			// the longer tqmasks go first....
-			if(fo->tqmaskLength() < o->tqmaskLength())
+			// the longer masks go first....
+			if(fo->maskLength() < o->maskLength())
 			{
 				// the current one is shorter than the new one...insert
 				l->insert(index,o);
diff --git a/src/kvilib/ext/kvi_sharedfiles.h b/src/kvilib/ext/kvi_sharedfiles.h
index 560e7494..385682a2 100644
--- a/src/kvilib/ext/kvi_sharedfiles.h
+++ b/src/kvilib/ext/kvi_sharedfiles.h
@@ -64,7 +64,7 @@ public:
 
 	unsigned int wildcardCount(){ return m_uWildCount; };
 	unsigned int nonWildcardCount(){ return m_uNonWildCount; };
-	int          tqmaskLength(){ return m_szUserMask.length(); };
+	int          maskLength(){ return m_szUserMask.length(); };
 };
 
 
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
index 4460cba6..cb90c009 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/kvi_ircmask.cpp
@@ -29,17 +29,17 @@
 #include "kvi_ircmask.h"
 
 /*
-	@doc: irc_tqmasks
+	@doc: irc_masks
 	@title:
-		Irc tqmasks
+		Irc masks
 	@type:
 		generic
 	@short:
-		Decription of the standard IRC tqmasks
+		Decription of the standard IRC masks
 	@keyterms:
-		irc tqmasks , nickname , username , hostname , wildcard
+		irc masks , nickname , username , hostname , wildcard
 	@body:
-		[big]Simple tqmasks[/big][br]
+		[big]Simple masks[/big][br]
 		An irc tqmask 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]
@@ -68,23 +68,23 @@
 		The IP address can be either in IPV4 format or in IPV6 format.[br]
 		Some (weird from my point of view) servers hide certain parts of the IP address to
 		prevent attacks to the user's machine.[br]
-		Here are some examples of full irc-tqmasks:[br]
+		Here are some examples of full irc-masks:[br]
 		Pragma!^[email protected][br]
 		[jazz][email protected][br]
 		[email protected][br]
 		HAN!^solo@ff0f:a0a0:1011::ea80:1[br]
 		[email protected][br]
-		The irc-tqmasks are [b]case insensitive[/b].[br]
+		The irc-masks are [b]case insensitive[/b].[br]
 		[br]
-		[big]Wildcard tqmasks[/big][br]
-		In some contexts the irc-tqmasks can contain '*' and '?' wildcards.[br]
-		The wild tqmasks are used to "match" an user within a set of them.[br]
+		[big]Wildcard masks[/big][br]
+		In some contexts the irc-masks can contain '*' and '?' wildcards.[br]
+		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]
 		[b]*!*@*[/b][br]
 		that designates "any nickname, any username on any host".[br]
-		Here are some examples of wild tqmasks:[br]
+		Here are some examples of wild masks:[br]
 		Pragma!*[email protected].*: matches any user with nickname "Pragma" , username that ends with "pragma" and
 		coming from any machine on the 212.101.102 network.[br]
 		*!solo@*.starwars.org: matches any nick with username solo (no prefix!) coming from any machine in
@@ -293,7 +293,7 @@ bool KviIrcMask::hasNumericHost() const
 	unsigned short uc;
 	while((uc = p->tqunicode()))
 	{
-		if(uc == '.')nPoints++; // ipv6 tqmasks can contain dots too!
+		if(uc == '.')nPoints++; // ipv6 masks can contain dots too!
 		else {
 			if(uc == ':')nDoublePoints++;
 			else {
@@ -341,7 +341,7 @@ bool KviIrcMask::hasNumericHost() const
 * 19: *!~user@*.host.top          (*[email protected].*)
 * 20: nick!*user@*.host.top          (nick!*[email protected].*)
 * 21: *!*user@*.host.top          (*!user@*XXX.XXX.*)
-* smart versions of the tqmasks 17-21 that try take care of tqmasked ip addresses
+* smart versions of the masks 17-21 that try take care of masked ip addresses
 * in the form xxx.xxx.INVALID-TOP-MASK
 * 22: nick!~user@*.host.top       ([email protected].*)
 * 23: nick!*@*.host.top          (nick!*@XXX.XXX.*)
@@ -363,13 +363,13 @@ bool KviIrcMask::hasNumericHost() const
 **	-	i line, no ident
 */
 
-static unsigned char tqmaskTable[27][3] = {
+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 , 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 , 1 }, //4 in the third field is like 3 but tries to detect tqmasked ip addresses too
+	{ 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 },
 	{ 1 , 0 , 1 },
@@ -396,9 +396,9 @@ static unsigned char tqmaskTable[27][3] = {
 void KviIrcMask::tqmask(TQString &szMask,MaskType eMaskType) const
 {
 	if((((int)eMaskType) > 26)||(((int)eMaskType) < 0))eMaskType = NickUserHost;
-	szMask = tqmaskTable[((int)eMaskType)][0] ? m_szWild : m_szNick;
+	szMask = maskTable[((int)eMaskType)][0] ? m_szWild : m_szNick;
 	szMask.append("!");
-	switch(tqmaskTable[((int)eMaskType)][1])
+	switch(maskTable[((int)eMaskType)][1])
 	{
 		case 0:
 			szMask.append(m_szUser);
@@ -421,7 +421,7 @@ void KviIrcMask::tqmask(TQString &szMask,MaskType eMaskType) const
 		break;
 	}
 	szMask.append('@');
-	switch(tqmaskTable[((int)eMaskType)][2])
+	switch(maskTable[((int)eMaskType)][2])
 	{
 		case 0:
 			szMask.append(m_szHost);
diff --git a/src/kvilib/irc/kvi_ircmask.h b/src/kvilib/irc/kvi_ircmask.h
index 18d6d70b..4efac627 100644
--- a/src/kvilib/irc/kvi_ircmask.h
+++ b/src/kvilib/irc/kvi_ircmask.h
@@ -65,7 +65,7 @@ public:
 	// nick[*]=<+|->user@host<br>
 	// The tqmask 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 tqmasks avaiable.
+	// If there are no more masks avaiable.
 	// WARNING : the szMask pointer can NOT be NULL
 	//const char *setUserhostMask(const TQString &szMask);
 	// Returns the nick of this user.<br>
@@ -108,7 +108,7 @@ public:
 		UserLargeNet = 19,          // 19 : *!~user@*.host.top          (*[email protected].*)
 		NickCleanUserLargeNet = 20, // 20 : nick!*user@*.host.top          (nick!*[email protected].*)
 		CleanUserLargeNet = 21,     // 21 : *!*user@*.host.top          (*!user@*XXX.XXX.*)
-		// smart versions of the tqmasks 17-21 that try take care of tqmasked ip addresses
+		// smart versions of the masks 17-21 that try take care of masked ip addresses
 		// in the form xxx.xxx.INVALID-TOP-MASK
 		NickUserSmartNet = 22,      // 22 : nick!~user@*.host.top       ([email protected].*)
 		NickSmartNet = 23,          // 23 : nick!*@*.host.top          (nick!*@XXX.XXX.*)
diff --git a/src/kvilib/system/kvi_thread.cpp b/src/kvilib/system/kvi_thread.cpp
index b3cb7708..472486f3 100644
--- a/src/kvilib/system/kvi_thread.cpp
+++ b/src/kvilib/system/kvi_thread.cpp
@@ -58,7 +58,7 @@ static void kvi_threadIgnoreSigalarm()
 			// Funky hack for some Solaris machines (maybe others ?)
 			// For an obscure (at least to me) reason
 			// when using threads ,some part of the system
-			// starts kidding us by sending a SIGALRM in aptqparently
+			// starts kidding us by sending a SIGALRM in apparently
 			// "random" circumstances. (Xlib ?) (XServer ?)
 			// The default action for SIGALRM is to exit the application.
 			// Could not guess more about this stuff...
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index 6181d804..27d9a54d 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -481,12 +481,12 @@
 	    TQPoint pos;
 	    int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
 	    if (activatedPos(pos)) {
-	        bool tqparentControl = false;
+	        bool parentControl = false;
 	        if (tqparent() && tqparent()->rtti() == 1  &&
 	            ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
-	            tqparentControl = true;
+	            parentControl = true;
 	
-	        int x = tqparentControl ? 0 : 3;
+	        int x = parentControl ? 0 : 3;
 	        int align = lv->columnAlignment(0);
 	        int marg = lv->itemMargin();
 	        int y = 0;
@@ -694,10 +694,10 @@
 	        return;
 	    }
 	
-	    bool tqparentControl = false;
+	    bool parentControl = false;
 	    if (tqparent() && tqparent()->rtti() == 1  &&
 	         ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
-	        tqparentControl = true;
+	        parentControl = true;
 	
 	    TQFontMetrics fm(lv->fontMetrics());
 	    int boxsize = lv->tqstyle()->tqpixelMetric(myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
@@ -726,7 +726,7 @@
 	
 	    if (myType == RadioButtonController) {
 	        int x = 0;
-	        if(!tqparentControl)
+	        if(!parentControl)
 	            x += 3;
 	        if (!pixmap(0)) {
 	            TQStyleOptionQ3ListView opt = getStyleOption(lv, this);
@@ -740,7 +740,7 @@
 	        Q_ASSERT(lv); //###
 	        int x = 0;
 	        int y = 0;
-	        if (!tqparentControl)
+	        if (!parentControl)
 	            x += 3;
 	        if (align & TQt::AlignVCenter)
 	            y = ((height() - boxsize) / 2) + marg;
@@ -774,13 +774,13 @@
 	        xdepth += p;
 	        intersect = r.intersects(TQRect(p, r.y(), xdepth - p + 1, r.height()));
 	    }
-	    bool tqparentControl = false;
+	    bool parentControl = false;
 	    if (tqparent() && tqparent()->rtti() == 1  &&
 	         ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController)
-	        tqparentControl = true;
+	        parentControl = true;
 	    if (myType != RadioButtonController && intersect &&
 	         (lv->rootIsDecorated() || myType == RadioButton ||
-	          (myType == CheckBox && tqparentControl))) {
+	          (myType == CheckBox && parentControl))) {
 	        TQRect rect;
 	        int boxsize = lv->tqstyle()->tqpixelMetric(TQStyle::PM_CheckListButtonSize, 0, lv);
 	        if (lv->columnAlignment(0) == TQt::AlignCenter) {
@@ -1218,12 +1218,12 @@
 	    TQPoint pos;
 	    int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
 	    if ( activatedPos( pos ) ) {
-		bool tqparentControl = FALSE;
+		bool parentControl = FALSE;
 		if ( tqparent() && tqparent()->rtti() == 1  &&
 		    ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
-		    tqparentControl = TRUE;
+		    parentControl = TRUE;
 	
-		int x = tqparentControl ? 0 : 3;
+		int x = parentControl ? 0 : 3;
 		int align = lv->columnAlignment( 0 );
 		int marg = lv->itemMargin();
 		int y = 0;
@@ -1431,10 +1431,10 @@
 		return;
 	    }
 	
-	    bool tqparentControl = FALSE;
+	    bool parentControl = FALSE;
 	    if ( tqparent() && tqparent()->rtti() == 1  &&
 		 ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
-		tqparentControl = TRUE;
+		parentControl = TRUE;
 	
 	    TQFontMetrics fm( lv->fontMetrics() );
 	    int boxsize = lv->tqstyle().tqpixelMetric( myType == RadioButtonController ? TQStyle::PM_CheckListControllerSize :
@@ -1461,7 +1461,7 @@
 	
 	    if ( myType == RadioButtonController ) {
 		int x = 0;
-		if(!tqparentControl)
+		if(!parentControl)
 		    x += 3;
 		if ( !pixmap( 0 ) ) {
 		    lv->tqstyle().tqdrawPrimitive(TQStyle::PE_CheckListController, p,
@@ -1474,7 +1474,7 @@
 		Q_ASSERT( lv ); //###
 		int x = 0;
 		int y = 0;
-		if ( !tqparentControl )
+		if ( !parentControl )
 		    x += 3;
 		if ( align & AlignVCenter )
 		    y = ( ( height() - boxsize ) / 2 ) + marg;
@@ -1511,13 +1511,13 @@
 		xdepth += p;
 		intersect = r.intersects( TQRect( p, r.y(), xdepth - p + 1, r.height() ) );
 	    }
-	    bool tqparentControl = FALSE;
+	    bool parentControl = FALSE;
 	    if ( tqparent() && tqparent()->rtti() == 1  &&
 		 ((KviTalCheckListItem*) tqparent())->type() == RadioButtonController )
-		tqparentControl = TRUE;
+		parentControl = TRUE;
 	    if ( myType != RadioButtonController && intersect &&
 		 (lv->rootIsDecorated() || myType == RadioButton ||
-		  (myType == CheckBox && tqparentControl) ) ) {
+		  (myType == CheckBox && parentControl) ) ) {
 		TQRect rect;
 		int boxsize = lv->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, lv);
 		if ( lv->columnAlignment(0) == AlignCenter ) {
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 3b2944ba..3e68ec55 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -695,7 +695,7 @@ void KviApp::contextSensitiveHelp()
 	// this stuff doesn't work with TQt 4.x
 #ifndef COMPILE_USE_QT4
 	// the F1 Key has been pressed
-	// try to pass it to the active widget or one of its tqparents
+	// try to pass it to the active widget or one of its parents
 	TQWidget * w = g_pApp->tqfocusWidget();
 	while(w)
 	{
@@ -711,7 +711,7 @@ void KviApp::contextSensitiveHelp()
 					return; // done!
 			}
 		}
-		w = w->tqparentWidget();
+		w = w->parentWidget();
 	}
 	// no way
 	// FIXME: just show up simple plain online help
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index f50e6f67..d990ff58 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -420,9 +420,9 @@ bool KviIconWidget::eventFilter(TQObject * o,TQEvent *e)
 			int iVal = szName.toInt(&bOk);
 			if(bOk)emit selected(iVal);
 
-			if(tqparentWidget() && isVisible() && tqparentWidget()->inherits("KviTalPopupMenu"))
+			if(parentWidget() && isVisible() && parentWidget()->inherits("KviTalPopupMenu"))
 			{
-				tqparentWidget()->close();
+				parentWidget()->close();
 				return true;
 			} else {
 				if(const TQPixmap * pix = ((TQLabel *)o)->pixmap())
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 0748501a..d4d79a96 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -721,7 +721,7 @@ void KviIrcConnection::changeAwayState(bool bAway)
 void KviIrcConnection::userInfoReceived(const TQString &szUserName,const TQString &szHostName)
 {
 	userInfo()->setUserName(szUserName);
-	TQString szUntqmaskedHost = m_pUserInfo->untqmaskedHostName();
+	TQString szUnmaskedHost = m_pUserInfo->unmaskedHostName();
 	// Update the user entry
 	KviIrcUserEntry * e = userDataBase()->tqfind(userInfo()->nickName());
 	if(e) // should be there! (we have the permanent entry in the notify list view)
@@ -792,14 +792,14 @@ void KviIrcConnection::userInfoReceived(const TQString &szUserName,const TQStrin
 			m_pUserInfo->setHostIp(szHostName);
 		} else 
 #ifdef COMPILE_IPV6_SUPPORT
-		if(KviNetUtils::isValidStringIp(szUntqmaskedHost) || KviNetUtils::isValidStringIp_V6(szUntqmaskedHost))
+		if(KviNetUtils::isValidStringIp(szUnmaskedHost) || KviNetUtils::isValidStringIp_V6(szUnmaskedHost))
 #else
-		if(KviNetUtils::isValidStringIp(szUntqmaskedHost))
+		if(KviNetUtils::isValidStringIp(szUnmaskedHost))
 #endif		 
 		{
 			if(!_OUTPUT_MUTE)
-				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("The local IP address as seen by the IRC server is %Q"),&szUntqmaskedHost);
-			m_pUserInfo->setHostIp(szUntqmaskedHost);
+				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("The local IP address as seen by the IRC server is %Q"),&szUnmaskedHost);
+			m_pUserInfo->setHostIp(szUnmaskedHost);
 		
 		} else {
 			// look it up too
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
index ec82da51..0553354d 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
@@ -230,10 +230,10 @@ const TQString & KviBasicIrcServerInfo::getBasicChannelModeDescription(TQChar mo
 		case 'o': return __tr2qs("Channel operators"); break;
 		case 'v': return __tr2qs("Voiced users"); break;
 		case 'h': return __tr2qs("Half-operators");break;
-		case 'b': return __tr2qs("Ban tqmasks"); break;
+		case 'b': return __tr2qs("Ban masks"); break;
 		case 'c': return __tr2qs("Color free (no ANSI colors)"); break;
-		case 'e': return __tr2qs("Ban exception tqmasks"); break;
-		case 'I': return __tr2qs("Invite exception tqmasks or forbid /INVITE"); break;
+		case 'e': return __tr2qs("Ban exception masks"); break;
+		case 'I': return __tr2qs("Invite exception masks or forbid /INVITE"); break;
 		case 's': return __tr2qs("Secret"); break;
 		case 'p': return __tr2qs("Private"); break;
 		case 't': return __tr2qs("Topic change restricted"); break;
diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h
index ba1f1b86..5fb59244 100644
--- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.h
+++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.h
@@ -49,12 +49,12 @@ private:
 	kvi_time_t m_tAway;               // time at that the user went away
 	TQString    m_szNickBeforeAway;    // the nickname that the user had just before going away
 	// From bugtrack:
-	// On many IRC networks the host is tqmasked or hashed, and if one also is connected through a LAN,
+	// On many IRC networks the host is masked or hashed, and if one also is connected through a LAN,
 	// it is basically impossible to initiate DCC transfers, as 192.168.0.13 or similar will be sent as IP.
-	// But IRC servers usually (at least in my experience) send the untqmasked host in the 001 raw event
+	// But IRC servers usually (at least in my experience) send the unmasked host in the 001 raw event
 	// with something like ":Welcome to the Internet Relay Chat network, nick!ident@host". I think
 	// it'd be a good idea to just grab the IP from that event and use it for DCC transfers by default.
-	TQString    m_szUntqmaskedHostName;
+	TQString    m_szUnmaskedHostName;
 public:
 	const TQString & realName(){ return m_szRealName; };
 	const TQString & nickName(){ return m_szNickName; };
@@ -62,7 +62,7 @@ public:
 	const TQString & userName(){ return m_szUserName; };
 	const TQString & localHostIp(){ return m_szLocalHostIp; };
 	const TQString & hostName(){ return m_szHostName; };
-	const TQString & untqmaskedHostName(){ return m_szUntqmaskedHostName; };
+	const TQString & unmaskedHostName(){ return m_szUnmaskedHostName; };
 	const TQString & hostIp(){ return m_szHostIp; };
 	const TQString & awayReason() { return m_szAwayReason; };
 	bool hasUserMode(const TQChar & m);
@@ -75,7 +75,7 @@ protected:
 	void setUserMode(const TQString &szUserMode){ m_szUserMode = szUserMode; };
 	void setUserName(const TQString &szUserName){ m_szUserName = szUserName; };
 	void setHostName(const TQString &szHostName){ m_szHostName = szHostName; };
-	void setUntqmaskedHostName(const TQString &szHostName){ m_szUntqmaskedHostName = szHostName; };
+	void setUnmaskedHostName(const TQString &szHostName){ m_szUnmaskedHostName = szHostName; };
 	void setHostIp(const TQString &szHostIp){ m_szHostIp = szHostIp; };
 	void setLocalHostIp(const TQString &szLocalHostIp){ m_szLocalHostIp = szLocalHostIp; };
 	bool addUserMode(const TQChar &m); // returns false if the mode was already there
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 312c184d..83b5e0e4 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -94,7 +94,7 @@
 		This might be a false assumption (since somehod.com does not even match *.it),
 		but it is the best result that the "stupid ISON method" can achieve.[br]
 		The "intelligent ISON method" will also check the Pragma's username and hostname
-		and match it in the registered tqmasks; so in the example above, you will be notified if
+		and match it in the registered masks; so in the example above, you will be notified if
 		any user that matches Pragma!*@*.it gets online; (but you will NOT be notified if
 		(for example) [email protected] gets online).[br]
 		So what's the point in including a stupid method? :) Well...the intelligent
@@ -579,7 +579,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 
 	// ok... complex step now: the remaining users in the userhost list are online
 	// if they have been online before, just remove them from the list
-	// otherwise they must be matched for tqmasks
+	// otherwise they must be matched for masks
 	// and eventually inserted in the notify view later
 
 	KviIrcUserDataBase * db = console()->connection()->userDataBase();
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
index d3d68ec0..459f0249 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
@@ -56,13 +56,13 @@ namespace KviKvsCoreFunctions
 		@short:
 			Retrieves the host tqmask of a user
 		@syntax:
-			$tqmask[(<nickname>[,<tqmask_type>])]
+			$tqmask[(<nickname>[,<mask_type>])]
 		@description:
 			Returns the specified type of tqmask for the user with <nickname>.[br]
 			If the host or username are not known, the tqmask may contain less information
 			than requested.[br]
 			If the <nickname> is not given it is assumed to be the current nickname.[br]
-			If <tqmask_type> is not given or is invalid, it is assumed to be 0.[br]
+			If <mask_type> is not given or is invalid, it is assumed to be 0.[br]
 			Available tqmask types:[br]
 			0 : [email protected]  ([email protected]) (default)[br]
 			1 : nick!user@*.abc.host.top        ([email protected].*)[br]
@@ -95,8 +95,8 @@ namespace KviKvsCoreFunctions
 			For example, if the hostname is missing, the tqmask type 3 or 4 may be reduced to type 5.[br]
 			If the user with <nickname> is not found in the current IRC context user database,
 			an empty string is returned.[br]
-			The tqmasks 22-26 are the smart versions of the tqmasks 17-21 that try take care of tqmasked ip addresses
-			in the form xxx.xxx.INVALID-TOP-MASK. If a tqmasked ip address is found then
+			The masks 22-26 are the smart versions of the masks 17-21 that try take care of masked ip addresses
+			in the form xxx.xxx.INVALID-TOP-MASK. If a masked ip address is found then
 			the XXX.XXX.* or XXX.* host tqmask is returned instead of the (wrong) *.INVALID-TOP-MASK
 		@examples:
 		@seealso:
@@ -105,14 +105,14 @@ namespace KviKvsCoreFunctions
 	KVSCF(tqmask)
 	{
 		TQString szNick;
-		kvs_uint_t tqmaskType;
+		kvs_uint_t maskType;
 
 		KVSCF_PARAMETERS_BEGIN
 			KVSCF_PARAMETER("nickname",KVS_PT_STRING,KVS_PF_OPTIONAL,szNick)
-			KVSCF_PARAMETER("tqmaskType",KVS_PT_UINT,KVS_PF_OPTIONAL,tqmaskType)
+			KVSCF_PARAMETER("maskType",KVS_PT_UINT,KVS_PF_OPTIONAL,maskType)
 		KVSCF_PARAMETERS_END
 
-		if(tqmaskType > 26) tqmaskType = 0;
+		if(maskType > 26) maskType = 0;
 
 		if(KVSCF_pContext->window()->console())
 		{
@@ -127,7 +127,7 @@ namespace KviKvsCoreFunctions
 					u.setHost(e->host());
 			
 					TQString tmp;
-					u.tqmask(tmp,(KviIrcMask::MaskType)tqmaskType);
+					u.tqmask(tmp,(KviIrcMask::MaskType)maskType);
 					KVSCF_pRetBuffer->setString(tmp);
 					return true;
 				}
@@ -257,12 +257,12 @@ namespace KviKvsCoreFunctions
 		@short:
 			Creates a new object
 		@syntax:
-			$new(<className>,[<tqparentHandle> [,<name>[,<param>[,<param>[...]]]])
+			$new(<className>,[<parentHandle> [,<name>[,<param>[,<param>[...]]]])
 		@description:
 			Creates a new instance of the object <class> with
-			the tqparent object <tqparent_id> and the specified <name>.[br]
-			<name> and <tqparent_id> are optional: if not specified, <name>
-			is assumed to be an empty string and <tqparent_id> default to 0 (tqparentless object).[br]
+			the tqparent object <parent_id> and the specified <name>.[br]
+			<name> and <parent_id> are optional: if not specified, <name>
+			is assumed to be an empty string and <parent_id> default to 0 (parentless object).[br]
 			Please see the [doc:objects]objects documentation[/doc] for more information.[br]
 		@examples:
 			[example]
@@ -282,7 +282,7 @@ namespace KviKvsCoreFunctions
 
 		KVSCF_PARAMETERS_BEGIN
 			KVSCF_PARAMETER("className",KVS_PT_NONEMPTYSTRING,0,szClassName)
-			KVSCF_PARAMETER("tqparentHandle",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hParent)
+			KVSCF_PARAMETER("parentHandle",KVS_PT_HOBJECT,KVS_PF_OPTIONAL,hParent)
 			KVSCF_PARAMETER("name",KVS_PT_STRING,KVS_PF_OPTIONAL,szName)
 			KVSCF_PARAMETER("parameterList",KVS_PT_VARIANTLIST,KVS_PF_OPTIONAL,vList)
 		KVSCF_PARAMETERS_END
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index cf86ed6c..c79e832f 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -208,11 +208,11 @@ namespace KviKvsCoreSimpleCommands
 		@title:
 			ban
 		@syntax:
-			ban <tqmask_list>
+			ban <mask_list>
 		@short:
-			Sets ban tqmasks for the channel
+			Sets ban masks for the channel
 		@description:
-			Sets the ban tqmasks specified in the <tqmask_list>,
+			Sets the ban masks specified in the <mask_list>,
 			which is a comma separated list of nicknames. 
 			This command works only if executed in a channel window.
 			The command is translated to a set of MODE messages containing
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 96548ad9..9fbffbd7 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -756,11 +756,11 @@ namespace KviKvsCoreSimpleCommands
 		@title:
 			unban
 		@syntax:
-			unban <tqmask_list>
+			unban <mask_list>
 		@short:
-			Unsets ban tqmasks for the channel
+			Unsets ban masks for the channel
 		@description:
-			Removes the ban tqmasks specified in the <tqmask_list>,
+			Removes the ban masks specified in the <mask_list>,
 			which is a comma separated list of nicknames.
 			This command works only if executed in a channel window.
 			The command is translated to a set of MODE messages containing
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 6d51de2f..572ea1ac 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -70,7 +70,7 @@
 
 		Objects are arranged in tree structures.
 		Each object that you create is either toplevel object or a tqchildren
-		of another object. A toplevel object is a tqparentless one.
+		of another object. A toplevel object is a parentless one.
 		Obviously all objects can have tqchildren objects.[br][br]
 
 		When an object is destroyed , all its tqchildren are also destroyed.
@@ -690,7 +690,7 @@ KviKvsObject::~KviKvsObject()
 
 	KviKvsKernel::instance()->objectController()->unregisterObject(this);
 
-	if(tqparentObject())tqparentObject()->unregisterChild(this);
+	if(parentObject())parentObject()->unregisterChild(this);
 
 	if(m_pObject)
 	{
@@ -707,14 +707,14 @@ bool KviKvsObject::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pPara
 	return true;
 }
 
-TQWidget * KviKvsObject::tqparentScriptWidget()
+TQWidget * KviKvsObject::parentScriptWidget()
 {
-	if(tqparentObject())
+	if(parentObject())
 	{
-		if(tqparentObject()->object())
+		if(parentObject()->object())
 		{
-			if(tqparentObject()->object()->isWidgetType())
-				return (TQWidget *)(tqparentObject()->object());
+			if(parentObject()->object()->isWidgetType())
+				return (TQWidget *)(parentObject()->object());
 		}
 	}
 	return 0;
@@ -920,7 +920,7 @@ bool KviKvsObject::function_name(KviKvsObjectFunctionCall * c)
 
 bool KviKvsObject::function_parent(KviKvsObjectFunctionCall * c)
 {
-	KviKvsObject * o = tqparentObject();
+	KviKvsObject * o = parentObject();
 	c->returnValue()->setHObject(o ? o->handle() : (kvs_hobject_t)0);
 	return true;
 }
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
index 10f2564e..5d16c74f 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/kvi_kvs_object.h
@@ -92,8 +92,8 @@ public:
 
 	const TQString & getName(){ return m_szName; };
 
-	KviKvsObject * tqparentObject(){ return (KviKvsObject *)tqparent(); };
-	TQWidget * tqparentScriptWidget();
+	KviKvsObject * parentObject(){ return (KviKvsObject *)tqparent(); };
+	TQWidget * parentScriptWidget();
 
 	bool connectSignal(const TQString &sigName,KviKvsObject * target,const TQString &slotName);
 	bool disconnectSignal(const TQString &sigName,KviKvsObjectConnection * con);
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h
index 6b334ddf..646b6163 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.h
+++ b/src/kvirc/kvs/kvi_kvs_object_class.h
@@ -76,7 +76,7 @@ public:
 	bool isDirty(){ return m_bDirty; };
 	bool isBuiltin(){ return m_bBuiltin; };
 	const TQString & name(){ return m_szName; };
-	KviKvsObjectClass * tqparentClass(){ return m_pParentClass; };
+	KviKvsObjectClass * parentClass(){ return m_pParentClass; };
 	// pProc CAN'T be zero here!
 	void registerFunctionHandler(const TQString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags = 0);
 	void registerFunctionHandler(const TQString & szFunctionName,const TQString &szBuffer,unsigned int uFlags = 0);
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index 3d439fde..24f3ac9a 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -428,10 +428,10 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffe
 		[/example]
 		The line above is an example of syntax specification. All the commands
 		are described by such syntax lines. [cmd]join[/cmd] is the command and it stands exactly
-		for the literal string "join" typed in a script. <channel> is in angular tqparenthesis
+		for the literal string "join" typed in a script. <channel> is in angular parenthesis
 		and rappresents a mandatory parameter: you must substitute a real channel name in its place
 		otherwise the command will fail and KVIrc will probably complain too.
-		[password] is still a parameter but the square tqparentheses indicate that it is
+		[password] is still a parameter but the square parentheses indicate that it is
 		optional: if you specify it, then it will be interpreted as the channel password,
 		if you don't then no password will be used.
 		[note]
@@ -701,7 +701,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffe
 		The function [fnc]$str.len[/fnc] accepts a single parameter and returns the
 		length in characters of the parameter string. The returned value is always
 		a string: in this case it can be also interpreted as a number.[br]
-		When passing an empty list you can avoid the tqparenthesis.
+		When passing an empty list you can avoid the parenthesis.
 		(And you have found the "simple" functions shown above).
 		So the followind two calls are equal:[br]
 		[example]
@@ -719,7 +719,7 @@ KviKvsTreeNodeInstruction * KviKvsParser::parseAsParameter(const TQChar * pBuffe
 		[/example]
 		If you want to place a literal '(' or ')' in the function parameters
 		you must escape it.
-		A special case for when you want to use 'matching' tqparentheses:
+		A special case for when you want to use 'matching' parentheses:
 		an opened '(' corresponds to a closed ')'.
 		In this case you can omit the 'escape' character.[br]
 		[example]
@@ -2458,7 +2458,7 @@ KviKvsTreeNodeData * KviKvsParser::parsePercentOrDollar(bool bInObjScope)
 			return r;
 		}
 		// we're not in object scope and cur char is either $ or %
-		// check for the common syntax $0!$1@$2 seen in hosttqmasks
+		// check for the common syntax $0!$1@$2 seen in hostmasks
 		// @$<digit> is non valid anyway
 		if(KVSP_curCharUnicode == '$')
 		{
diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
index adeef3d8..ee91df41 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
@@ -577,7 +577,7 @@ KviKvsTreeNodeExpression * KviKvsParser::parseExpression(char terminator)
 			// incomplete has GREATER precedence than aux and thus aux should be done first
 			incompleteOperator->setRight(operand); //right tree complete
 			// go up until we find an operator with lower precedence than auxOperator (>=)
-			KviKvsTreeNodeExpression * tempOperator = incompleteOperator->tqparentWithPrecedenceLowerThan(auxOperator->precedence());
+			KviKvsTreeNodeExpression * tempOperator = incompleteOperator->parentWithPrecedenceLowerThan(auxOperator->precedence());
 			if(tempOperator == 0)
 			{
 				auxOperator->setLeft(curTopOperator);
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
index d6437c7d..bfb0bd52 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
@@ -156,7 +156,7 @@
 		[b]<left_operand> =~ s/<search pattern>/<replacement pattern>/[flags][/b][br]
 		where <search pattern> is an extended regular expression to be matched in the <left_operand>
 		and <replacement string> is a special pattern that will replace any occurence found.[br]
-		<search pattern> may contain tqparentheses to capture parts of the matched text.
+		<search pattern> may contain parentheses to capture parts of the matched text.
 		<replacement string> can contain the escape sequences \\N where N is a number between 1 and 9
 		to be replaced by the captured text.[br]
 		(We use \\N because KVIrc will first unquote the string when parsing...)[br]
@@ -662,7 +662,7 @@ end_of_the_param:
 		[b]<left_operand> =~ s/<search pattern>/<replacement pattern>/[flags][/b][br]
 		where <search pattern> is an extended regular expression to be matched in the <left_operand>
 		and <replacement string> is a special pattern that will replace any occurence found.[br]
-		<search pattern> may contain tqparentheses to capture parts of the matched text.
+		<search pattern> may contain parentheses to capture parts of the matched text.
 		<replacement string> can contain the escape sequences \\N where N is a number between 1 and 9
 		to be replaced by the captured text.[br]
 		(We use \\N because KVIrc will first unquote the string when parsing...)[br]
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index 0014743f..4cf0cbc7 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -329,7 +329,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 			that can be used to sign the parameters that the function expects;
 			it acts as a programmer reminder or comment and it has no other
 			meaning in KVIrc scripting. The <parameter reminder> respects the syntax
-			of an expression, so it is terminated by a closed tqparenthesis.
+			of an expression, so it is terminated by a closed parenthesis.
 			It's rather dangerous to use this command inside an object
 			function handler: if the class definition <class> was already 
 			existing and it is a tqparent of the object's class, you might
@@ -376,7 +376,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandClass()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
 		return 0;
 	}
 
@@ -627,8 +627,8 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandWhile()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in tqparenthesis"));
-		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open tqparenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
+		warning(KVSP_curCharPointer,__tr2qs("The while command needs an expression enclosed in parenthesis"));
+		error(KVSP_curCharPointer,__tr2qs("Found character %q (tqunicode %x) where an open parenthesis was expected"),KVSP_curCharPointer,KVSP_curCharUnicode);
 		return 0;
 	}
 
@@ -756,7 +756,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDo()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in tqparenthesis"));
+		warning(KVSP_curCharPointer,__tr2qs("The 'while' block of the 'do' command needs an expression enclosed in parenthesis"));
 		errorBadChar(KVSP_curCharPointer,'(',"do");
 		if(i)delete i;
 		return 0;
@@ -822,7 +822,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandIf()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in tqparenthesis"));
+		warning(KVSP_curCharPointer,__tr2qs("The 'if' command needs an expression enclosed in parenthesis"));
 		errorBadChar(KVSP_curCharPointer,'(',"if");
 		return 0;
 	}
@@ -967,7 +967,7 @@ bool KviKvsParser::skipToEndOfForControlBlock()
 				return false;
 			break;
 			//case '\n':
-				// that's ok.. it may have a tqparenthesis on the next line
+				// that's ok.. it may have a parenthesis on the next line
 				//KVSP_skipChar;
 			//break;
 			default:
@@ -1012,7 +1012,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandFor()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in tqparenthesis"));
+		warning(KVSP_curCharPointer,__tr2qs("The 'for' command needs an expression enclosed in parenthesis"));
 		errorBadChar(KVSP_curCharPointer,'(',"for");
 		return 0;
 	}
@@ -1178,7 +1178,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandForeach()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in tqparenthesis"));
+		warning(KVSP_curCharPointer,__tr2qs("The 'foreach' command needs an expression enclosed in parenthesis"));
 		errorBadChar(KVSP_curCharPointer,'(',"foreach");
 		return 0;
 	}
@@ -1362,7 +1362,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandSwitch()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in tqparenthesis"));
+		warning(KVSP_curCharPointer,__tr2qs("The 'switch' command needs an expression enclosed in parenthesis"));
 		errorBadChar(KVSP_curCharPointer,'(',"switch");
 		return 0;
 	}
@@ -1928,7 +1928,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandDefpopup()
 
 	if(KVSP_curCharUnicode != '(')
 	{
-		warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in tqparenthesis"));
+		warning(KVSP_curCharPointer,__tr2qs("The 'defpopup' command needs an expression enclosed in parenthesis"));
 		errorBadChar(KVSP_curCharPointer,'(',"defpopup");
 		return 0;
 	}
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 5b592ade..6028d1d6 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -598,7 +598,7 @@ void KviKvsPopupMenu::addEpilogue(const TQString &szItemName,const TQString &szC
 
 KviKvsPopupMenuTopLevelData * KviKvsPopupMenu::topLevelData()
 {
-	if(tqparentPopup())return tqparentPopup()->topLevelData();
+	if(parentPopup())return parentPopup()->topLevelData();
 	return m_pTopLevelData;
 }
 
@@ -661,7 +661,7 @@ bool KviKvsPopupMenu::isLocked()
 
 KviKvsPopupMenu * KviKvsPopupMenu::topLevelPopup()
 {
-	if(tqparentPopup())return tqparentPopup();
+	if(parentPopup())return parentPopup();
 	return this;
 }
 
@@ -782,7 +782,7 @@ void KviKvsPopupMenu::lock(bool bLock)
 void KviKvsPopupMenu::setupMenuContents()
 {
 	// This might be a compat problem later :((((
-	if(tqparentPopup() == 0)
+	if(parentPopup() == 0)
 	{
 		if(m_pTempTopLevelData == 0)
 		{
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h
index 11ca6481..c681aa83 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h
@@ -278,7 +278,7 @@ public:
 	bool removeItemByName(const TQString &szItemName,bool bRecursive);
 	KviPointerList<KviKvsScript> * epilogues(){ return m_pEpilogues; };
 	KviPointerList<KviKvsScript> * prologues(){ return m_pPrologues; };
-	KviKvsPopupMenu * tqparentPopup(){ return m_pParentPopup; };
+	KviKvsPopupMenu * parentPopup(){ return m_pParentPopup; };
 	void generateDefPopup(TQString &buffer);
 	void setParentPopup(KviKvsPopupMenu * par){ m_pParentPopup = par; };
 	void generateDefPopupCore(TQString &buffer);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
index 837ef84d..61a4151f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
@@ -77,11 +77,11 @@ void KviKvsTreeNodeExpression::setRight(KviKvsTreeNodeExpression *)
 	debug("KviKvsTreeNodeExpression::setRight() : should never end up here!");
 }
 
-KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::tqparentWithPrecedenceLowerThan(int iPrec)
+KviKvsTreeNodeExpression * KviKvsTreeNodeExpression::parentWithPrecedenceLowerThan(int iPrec)
 {
 	if(precedence() > iPrec)return this;
-	if(!tqparentExpression())return 0;
-	return tqparentExpression()->tqparentWithPrecedenceLowerThan(iPrec);
+	if(!parentExpression())return 0;
+	return parentExpression()->parentWithPrecedenceLowerThan(iPrec);
 }
 
 int KviKvsTreeNodeExpression::firstBinaryOperator()
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.h b/src/kvirc/kvs/kvi_kvs_treenode_expression.h
index 3ab8fd5e..6688f5b9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.h
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.h
@@ -84,9 +84,9 @@ public:
 	virtual void setLeft(KviKvsTreeNodeExpression * pLeft);
 	virtual void setRight(KviKvsTreeNodeExpression * pRight);
 	virtual int firstBinaryOperator();
-	KviKvsTreeNodeExpression * tqparentExpression(){ return m_pParentExpression; };
+	KviKvsTreeNodeExpression * parentExpression(){ return m_pParentExpression; };
 	void setParentExpression(KviKvsTreeNodeExpression * pParent){ m_pParentExpression = pParent; };
-	virtual KviKvsTreeNodeExpression * tqparentWithPrecedenceLowerThan(int iPrec);
+	virtual KviKvsTreeNodeExpression * parentWithPrecedenceLowerThan(int iPrec);
 };
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
index 0ec0f275..24f0bdcc 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
@@ -137,7 +137,7 @@ bool KviKvsTreeNodeSpecialCommandClass::execute(KviKvsRunTimeContext * c)
 			c->error(this,__tr2qs("Detected a loop in the inheritance tree of the base class \"%Q\": redefine that class first"),&szBaseClassName);
 			return false;
 		}
-		pClass = pClass->tqparentClass();
+		pClass = pClass->parentClass();
 	}
 	
 	KviKvsObjectClass * pActualClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName,true);
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 4b71c366..6a6845d8 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -78,7 +78,7 @@ void KviServerParser::parseNumeric001(KviIrcMessage *msg)
 	TQRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" );
 	if( rx.search(szText) != -1)
 	{
-		msg->connection()->userInfo()->setUntqmaskedHostName(rx.cap(3));
+		msg->connection()->userInfo()->setUnmaskedHostName(rx.cap(3));
 		msg->connection()->userInfo()->setNickName(rx.cap(1));
 		msg->connection()->userInfoReceived(rx.cap(2),rx.cap(3));
 	}
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 8ad6ffb1..206cadbe 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -507,13 +507,13 @@ void KviChannel::toggleEditor(KviMaskEditor ** ppEd,KviWindowToolPageButton ** p
 
 void KviChannel::removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l)
 {
-	KviStr tqmasks;
+	KviStr masks;
 	KviStr flags;
 	unsigned int count = 0;
 	for(KviMaskEntry * e = l->first();e;e = l->next())
 	{
-		if(tqmasks.hasData())tqmasks.append(' ');
-		tqmasks.append(e->szMask);
+		if(masks.hasData())masks.append(' ');
+		masks.append(e->szMask);
 		flags.append(ed->flag());
 		count++;
 		if(count == connection()->serverInfo()->maxModeChanges())
@@ -521,19 +521,19 @@ void KviChannel::removeMasks(KviMaskEditor *ed,KviPointerList<KviMaskEntry> *l)
 			if(connection())
 			{
 				KviTQCString szName = connection()->encodeText(m_szName);
-				connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(tqmasks)).data());
+				connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(masks)).data());
 			}
 			flags = "";
-			tqmasks = "";
+			masks = "";
 			count = 0;
 		}
 	}
-	if(tqmasks.hasData())
+	if(masks.hasData())
 	{
 		if(connection())
 		{
 			KviTQCString szName = connection()->encodeText(m_szName);
-			connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(tqmasks)).data());
+			connection()->sendFmtData("MODE %s -%s %s",szName.data(),flags.ptr(),connection()->encodeText(TQString(masks)).data());
 		}
 	}
 }
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index 98f9fc6b..0a824495 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -51,9 +51,9 @@ class KviTalHBox;
 
 #ifdef COMPILE_ON_WINDOWS
 	// windows compiler wants this instead of the forward decl
-	#include "kvi_tqmaskeditor.h"
+	#include "kvi_maskeditor.h"
 #else
-	typedef struct _KviMaskEntry KviMaskEntry; // kvi_tqmaskeditor.h
+	typedef struct _KviMaskEntry KviMaskEntry; // kvi_maskeditor.h
 #endif
 class KviMaskEditor;
 class KviModeEditor;
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 6b6db20c..cf7d5a7d 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -309,7 +309,7 @@ KviMexToolBar * KviFrame::moduleExtensionToolBar(int extensionId)
 		[b]Tab after a leading /[/b]: Completes commands[br]
 		[b]Tab after a / in the middle of input[/b]: Completes directories[br]
 		[b]Tab after a $[/b]: Completes function names[br]
-		[b]Shift+Tab after the first word of input[/b]: completes tqmasks in the current channel or query[br]
+		[b]Shift+Tab after the first word of input[/b]: completes masks in the current channel or query[br]
 		[b]Ctrl+B[/b]: Inserts the 'bold' mIRC text control character[br]
 		[b]Ctrl+K[/b]: Inserts the 'color' mIRC text control character[br]
 		[b]Ctrl+R[/b]: Inserts the 'reverse' mIRC text control character[br]
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
index b2af2cb3..e5517717 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
@@ -129,7 +129,7 @@ void KviToolBarGraphicalApplet::mouseMoveEvent(TQMouseEvent * e)
 			if(w > 480)w = 480;
 			m_tqsizeHint = TQSize(w,22);
 			resize(w,height());
-			g_pApp->postEvent(tqparentWidget(),new TQEvent(TQEvent::LayoutHint));
+			g_pApp->postEvent(parentWidget(),new TQEvent(TQEvent::LayoutHint));
 		}
 	} else {
 		if(e->pos().x() > width() - 4)
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 9d1ce473..b8b7903f 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -2598,7 +2598,7 @@ check_emoticon_char:
 		case KVI_OUT_DCCCHATMSG:
 	{
 		// Pragma: 31.05.2002 : I had to kill the 8 prefix
-		// It happens really too often to have an 8 followed by a tqparenthesis
+		// It happens really too often to have an 8 followed by a parenthesis
 		// that is not an emoticon
 
 		// *begin can be one of ':' , ';' , '='
@@ -4931,7 +4931,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin
 			
 			if(linkText.tqfind('*') != -1)
 			{
-				if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be tqmasked");
+				if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be masked");
 				else tip += __tr2qs("Unable to look it up hostname: Unknown host");
 			} else {
 				tip += __tr2qs("Double-click to look up this hostname<br>Right-click to view other options");
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index e462a736..26912ef4 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -169,7 +169,7 @@ public:
 	bool saveBuffer(const char *filename);
 	void findNext(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
 	void findPrev(const TQString& szText,bool bCaseS = false,bool bRegExp = false,bool bExtended = false);
-	KviWindow * tqparentKviWindow(){ return m_pKviWindow; };
+	KviWindow * parentKviWindow(){ return m_pKviWindow; };
 	KviConsole * console();
 	// A null pixmap passed here unsets the private backgrdound.
 	void setPrivateBackgroundPixmap(const TQPixmap &pixmap,bool bRepaint=true);
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 6a78a70e..f00100a3 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : kvi_tqmaskeditor.cpp
+//   File : kvi_maskeditor.cpp
 //   Creation date : Tue Aug 30 2000 12:24:59 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -123,7 +123,7 @@ void KviMaskInputDialog::accept()
 	TQDialog::accept();
 }
 
-KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * tqmaskList,char flag,const char * nam)
+KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,char flag,const char * nam)
 : KviWindowToolWidget(par,button)
 {
 	bool isEnabled=1;
@@ -233,7 +233,7 @@ KviMaskEditor::KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviP
 	
 	g->setColStretch(3,1);
 
-	for(KviMaskEntry * e = tqmaskList->first();e;e = tqmaskList->next()) addMask(e);
+	for(KviMaskEntry * e = maskList->first();e;e = maskList->next()) addMask(e);
 	registerSelf();
 }
 
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index 9c6c77be..47a53e88 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -2,7 +2,7 @@
 #define _KVI_MASKEDITOR_H_
 
 //
-//   File : kvi_tqmaskeditor.h
+//   File : kvi_maskeditor.h
 //   Creation date : Tue Aug 30 2000 12:20:10 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -84,7 +84,7 @@ class KVIRC_API KviMaskEditor : public KviWindowToolWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * tqmaskList,
+	KviMaskEditor(TQWidget * par,KviWindowToolPageButton* button,KviPointerList<KviMaskEntry> * maskList,
 		char flag,const char * nam);
 	~KviMaskEditor();
 protected:
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 08f3af2a..80d0cac1 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -79,9 +79,9 @@ void KviMdiCaptionButton::paintEvent(TQPaintEvent *e)
 void KviMdiCaptionButton::drawButton(TQPainter *p)
 {
 #ifdef COMPILE_USE_QT4
-	TQBrush b(tqparentWidget()->palette().window());
+	TQBrush b(parentWidget()->palette().window());
 #else
-	TQBrush b(tqparentWidget()->tqcolorGroup().background());
+	TQBrush b(parentWidget()->tqcolorGroup().background());
 #endif
 	
 	if(isDown())
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 9dcafaf6..398d49e7 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -608,7 +608,7 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
 
 	updateSDIMode();
 }
-void KviMdiManager::retqlayoutMenuButtons()
+void KviMdiManager::relayoutMenuButtons()
 {
 #ifdef COMPILE_USE_QT4
 	// force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode())
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index cd5e84d8..9577ef6b 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -106,7 +106,7 @@ protected:
 	virtual void drawContents(TQPainter * p,int x,int y,int w,int h);
 	virtual bool focusNextPrevChild(bool pNext);
 public slots:
-	void retqlayoutMenuButtons();
+	void relayoutMenuButtons();
 	void cascadeWindows();
 	void cascadeMaximized();
 	void expandVertical();
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index 6401ed85..585b75b8 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -99,7 +99,7 @@ void KviMenuBar::showEvent(TQShowEvent *e)
 	debug("menubar show");
 	// force a re-tqlayout of the menubar in TQt4 (see the note in enterSDIMode())
 	// by resetting the corner widget
-	m_pFrm->mdiManager()->retqlayoutMenuButtons();
+	m_pFrm->mdiManager()->relayoutMenuButtons();
 #endif
 }
 
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 6aad95bb..c7d8bba9 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -204,7 +204,7 @@ void KviStatusBar::save()
 #define SPACING 3
 #define RICHTEXTLABELTRICK 2
 
-void KviStatusBar::tqlayoutChildren()
+void KviStatusBar::layoutChildren()
 {
 	int x = width() - HMARGIN;
 	int h = height() - (VMARGIN * 2);
@@ -221,7 +221,7 @@ void KviStatusBar::tqlayoutChildren()
 
 void KviStatusBar::resizeEvent(TQResizeEvent * e)
 {
-	tqlayoutChildren();
+	layoutChildren();
 }
 
 bool KviStatusBar::event(TQEvent * e)
@@ -229,7 +229,7 @@ bool KviStatusBar::event(TQEvent * e)
 	if(e->type() == TQEvent::LayoutHint)
 	{
 		updateLayout();
-		return false; // send to tqparents too!
+		return false; // send to parents too!
 	}
 	return TQStatusBar::event(e);
 }
@@ -525,7 +525,7 @@ void KviStatusBar::mouseMoveEvent(TQMouseEvent * e)
 		if(p.x() > (a->width() / 2))idx++; // just after
 		m_pAppletList->insert(idx,m_pClickedApplet);
 	}
-	tqlayoutChildren();
+	layoutChildren();
 }
 
 void KviStatusBar::mouseReleaseEvent(TQMouseEvent * e)
diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h
index 0030ea5c..a2988611 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/kvi_statusbar.h
@@ -98,8 +98,8 @@ protected:
 	void registerApplet(KviStatusBarApplet * a);
 	void unregisterApplet(KviStatusBarApplet * a);
 	void recalcMinimumHeight();
-	void tqlayoutChildren();
-	void updateLayout(){ recalcMinimumHeight(); tqlayoutChildren(); };
+	void layoutChildren();
+	void updateLayout(){ recalcMinimumHeight(); layoutChildren(); };
 	void save();
 	void load();
 	KviStatusBarApplet * createApplet(const TQString &szInternalName);
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index f86b6c2d..7cc410bf 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -355,7 +355,7 @@ protected:
 
 	bool eventFilter(TQObject *o,TQEvent *e);
 
-	// Virtuals overridden to manage the internal tqlayouts...
+	// Virtuals overridden to manage the internal layouts...
 	virtual void moveEvent(TQMoveEvent *e);
 	virtual void closeEvent(TQCloseEvent *e);
 	virtual void wheelEvent(TQWheelEvent *e);
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index adbbae71..5a587792 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -370,7 +370,7 @@ void KviScriptManagementDialog::installScript()
 
 void KviScriptManagementDialog::showEvent(TQShowEvent * e)
 {
-//	TQRect r = tqparentWidget() ? tqparentWidget()->rect() : TQApplication::desktop()->rect();
+//	TQRect r = parentWidget() ? parentWidget()->rect() : TQApplication::desktop()->rect();
 //	int x = (r.width() - width()) / 2;
 //	int y = (r.height() - height()) / 2;
 //	move(x,y);
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 74d37529..a8c8c6fe 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -310,7 +310,7 @@ TQString KviAliasEditor::buildFullItemName(KviAliasEditorListViewItem * it)
 {
 	if(!it) return TQString();
 	TQString szName = it->name();
-	KviAliasNamespaceListViewItem * nit = it->tqparentNamespaceItem();
+	KviAliasNamespaceListViewItem * nit = it->parentNamespaceItem();
 	while(nit)
 	{
 		TQString tmp = nit->name();
@@ -319,7 +319,7 @@ TQString KviAliasEditor::buildFullItemName(KviAliasEditorListViewItem * it)
 			szName.prepend("::");
 			szName.prepend(tmp);
 		}
-		nit = nit->tqparentNamespaceItem();
+		nit = nit->parentNamespaceItem();
 	}
 	return szName;
 }
@@ -1024,7 +1024,7 @@ void KviAliasEditor::newAlias()
 	{
 		if(!itemExists(m_pLastClickedItem,m_pListView->firstChild()))return; // dead ?
 		if(m_pLastClickedItem->isAlias())
-			m_pLastClickedItem = m_pLastClickedItem->tqparentNamespaceItem();
+			m_pLastClickedItem = m_pLastClickedItem->parentNamespaceItem();
 	}
 
 	TQString szNewName = askForAliasName(__tr2qs("Add Alias"),__tr2qs("Please enter the name for the new alias"),"myfunction");
@@ -1048,7 +1048,7 @@ void KviAliasEditor::newNamespace()
 	{
 		if(!itemExists(m_pLastClickedItem,m_pListView->firstChild()))return; // dead ?
 		if(m_pLastClickedItem->isAlias())
-			m_pLastClickedItem = m_pLastClickedItem->tqparentNamespaceItem();
+			m_pLastClickedItem = m_pLastClickedItem->parentNamespaceItem();
 	}
 		
 
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index 570fe943..927963ba 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -60,7 +60,7 @@ public:
 	bool isAlias(){ return m_eType == Alias; };
 	bool isNamespace(){ return m_eType == Namespace; };
 	void setParentNamespaceItem(KviAliasNamespaceListViewItem* it){ m_pParentNamespaceItem=it; };
-	KviAliasNamespaceListViewItem * tqparentNamespaceItem(){ return m_pParentNamespaceItem; };
+	KviAliasNamespaceListViewItem * parentNamespaceItem(){ return m_pParentNamespaceItem; };
 	virtual TQString key(int column,bool bAsc) const;
 };
 
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index a2ff3bb3..b7600f81 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1040,7 +1040,7 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 		"ovhn" are mode flags: the users are added to the array only if they are channel administrators ('a'), operators ('o'),
 		voiced users ('v'), half-operators ('h'), user-operators ('u') or unflagged ('n') users. (Unflagged means not operators, not
 		voiced and not half-operators). If none of the "ovhun" flags are used, KVIrc behaves like all five were passed.[br]
-		The flag 'm' causes the entire user tqmasks to be added to the 
+		The flag 'm' causes the entire user masks to be added to the 
 		array entries, as known by KVIrc at the moment of this function call.[br]
 		The flag 'i' causes KVIrc to invert the match and add only the users that do NOT match [tqmask].[br]
 		Please note that on really large channels this function may be time consuming (especially if [tqmask] is used):
@@ -1182,11 +1182,11 @@ next_item:
 	@title:
 		$chan.banlist
 	@short:
-		Returns an array of channel ban tqmasks
+		Returns an array of channel ban masks
 	@syntax:
 		$chan.banlist([window_id])
 	@description:
-		Returns an array of ban tqmasks set ont the channel identified by [window_id].[br]
+		Returns an array of ban masks set ont the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 */
@@ -1225,11 +1225,11 @@ static bool chan_kvs_fnc_banlist(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.banexceptionlist
 	@short:
-		Returns an array of channel ban exception tqmasks
+		Returns an array of channel ban exception masks
 	@syntax:
 		<array> $chan.banexceptionlist([window_id])
 	@description:
-		Returns an array of ban exception tqmasks set ont the channel identified by [window_id].[br]
+		Returns an array of ban exception masks set ont the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 */
@@ -1268,11 +1268,11 @@ static bool chan_kvs_fnc_banexceptionlist(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.invitelist
 	@short:
-		Returns an array of channel invite tqmasks
+		Returns an array of channel invite masks
 	@syntax:
 		<array> $chan.banexceptionlist([window_id])
 	@description:
-		Returns an array of invite tqmasks set ont the channel identified by [window_id].[br]
+		Returns an array of invite masks set ont the channel identified by [window_id].[br]
 		If [window_id] is empty, the current window is used.[br]
 		If the window designated by [window_id] is not a channel a warning is printed and an empty array is returned.[br]
 */
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 57fb170f..c9d56e3e 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -210,7 +210,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	box->setStretchFactor(m_pParamsEdit,1);
 	TQToolTip::add(m_pParamsEdit,__tr2qs("<center><b>/LIST command parameters:</b><br>Many servers accept special parameters that " \
 						"allow you to filter the returned entries.<br>" \
-						"Commonly, tqmasked channel names (*kvirc*) are accepted as parameters, as well as strings " \
+						"Commonly, masked channel names (*kvirc*) are accepted as parameters, as well as strings " \
 						"like <b>c&lt;n</b> or <b>c&gt;n</b> where <b>n</b> is the minimum or maximum of users on the channel.</center>"));
 
 	m_pInfoLabel = new KviThemedLabel(m_pTopSplitter,"info_label");
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index 0e810c34..0c75fc52 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -47,7 +47,7 @@
 			[/example]
 	*/
 
-static bool tqmask_kvs_fnc_match(KviKvsModuleFunctionCall * c)
+static bool mask_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 { 
 
 	TQString wildtqmask,fixedtqmask;
@@ -75,7 +75,7 @@ static bool tqmask_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 			Returns the nickname part of an IRC tqmask.
 	*/
 
-static bool tqmask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
+static bool mask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
 {
 
 	TQString tqmask;
@@ -101,7 +101,7 @@ static bool tqmask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
 			Returns the username part of an IRC tqmask.
 	*/
 
-static bool tqmask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
+static bool mask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
 {
 
 	TQString tqmask;
@@ -128,7 +128,7 @@ static bool tqmask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
 			Returns the hostname part of an IRC tqmask.
 	*/
 
-static bool tqmask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
+static bool mask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 {
 	TQString tqmask;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -155,7 +155,7 @@ static bool tqmask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 	*/
 
 
-static bool tqmask_kvs_fnc_hasnumerichost(KviKvsModuleFunctionCall * c)
+static bool mask_kvs_fnc_hasnumerichost(KviKvsModuleFunctionCall * c)
 {
 	TQString tqmask;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -173,18 +173,18 @@ static bool tqmask_kvs_fnc_hasnumerichost(KviKvsModuleFunctionCall * c)
 
 
 
-static bool tqmask_module_init(KviModule * m)
+static bool mask_module_init(KviModule * m)
 {
-	KVSM_REGISTER_FUNCTION(m,"match",tqmask_kvs_fnc_match);
-	KVSM_REGISTER_FUNCTION(m,"nick",tqmask_kvs_fnc_nick);
-	KVSM_REGISTER_FUNCTION(m,"user",tqmask_kvs_fnc_user);
-	KVSM_REGISTER_FUNCTION(m,"host",tqmask_kvs_fnc_host);
-	KVSM_REGISTER_FUNCTION(m,"hasnumerichost",tqmask_kvs_fnc_hasnumerichost);
+	KVSM_REGISTER_FUNCTION(m,"match",mask_kvs_fnc_match);
+	KVSM_REGISTER_FUNCTION(m,"nick",mask_kvs_fnc_nick);
+	KVSM_REGISTER_FUNCTION(m,"user",mask_kvs_fnc_user);
+	KVSM_REGISTER_FUNCTION(m,"host",mask_kvs_fnc_host);
+	KVSM_REGISTER_FUNCTION(m,"hasnumerichost",mask_kvs_fnc_hasnumerichost);
 
 	return true;
 }
 
-static bool tqmask_module_cleanup(KviModule *m)
+static bool mask_module_cleanup(KviModule *m)
 {
 	return true;
 }
@@ -194,8 +194,8 @@ KVIRC_MODULE(
 	"1.0.0",                                                // module version
 	"Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)",
 	"Mask manipulation functions",
-	tqmask_module_init,
+	mask_module_init,
 	0,
 	0,
-	tqmask_module_cleanup
+	mask_module_cleanup
 )
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index 07a93760..d98d44af 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -247,7 +247,7 @@ static bool my_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 	@description:
 		Returns the ip address of the current irc context as known by the IRC server.[br]
 		The ip address is resolved as soon as the hostname is received from the server.
-		If the hostname is tqmasked or there is an error in the DNS lookup then
+		If the hostname is masked or there is an error in the DNS lookup then
 		you may get the real local host ip address as determined at connection startup.[br]
 		If the irc context is not connected then an empty string is returned.[br]
 		If <irc_context_id> is specified this function returns acts as it was called
diff --git a/src/modules/objects/class_button.cpp b/src/modules/objects/class_button.cpp
index c3710cc1..a23dcda1 100644
--- a/src/modules/objects/class_button.cpp
+++ b/src/modules/objects/class_button.cpp
@@ -57,7 +57,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_button)
 
 bool KviKvsObject_button::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQPushButton(tqparentScriptWidget(),name())),true);
+	setObject(TQT_TQOBJECT(new TQPushButton(parentScriptWidget(),name())),true);
 	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
 	return true;
 }
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index 611341ae..d0f25543 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -73,11 +73,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_buttongroup)
 bool KviKvsObject_buttongroup::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	#ifdef COMPILE_USE_QT4
-		TQButtonGroup *group=new TQButtonGroup(tqparentScriptWidget());
+		TQButtonGroup *group=new TQButtonGroup(parentScriptWidget());
 		group->setObjectName(name());
 		setObject(group,true);
 	#else
-		setObject(TQT_TQOBJECT(new TQButtonGroup(name(),tqparentScriptWidget())), true);
+		setObject(TQT_TQOBJECT(new TQButtonGroup(name(),parentScriptWidget())), true);
 	#endif	
 
 
diff --git a/src/modules/objects/class_checkbox.cpp b/src/modules/objects/class_checkbox.cpp
index 27a0fc1d..758e414d 100644
--- a/src/modules/objects/class_checkbox.cpp
+++ b/src/modules/objects/class_checkbox.cpp
@@ -79,7 +79,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_checkbox)
 
 bool KviKvsObject_checkbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	KviStyledCheckBox  * cb = new KviStyledCheckBox(tqparentScriptWidget(), name());
+	KviStyledCheckBox  * cb = new KviStyledCheckBox(parentScriptWidget(), name());
 	setObject(TQT_TQOBJECT(cb), true);
 	connect(cb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
 	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
diff --git a/src/modules/objects/class_combobox.cpp b/src/modules/objects/class_combobox.cpp
index 38f4472a..88a1b423 100644
--- a/src/modules/objects/class_combobox.cpp
+++ b/src/modules/objects/class_combobox.cpp
@@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_combobox)
 
 bool KviKvsObject_combobox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQComboBox(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQComboBox(parentScriptWidget(), name())), true);
 	connect (((TQComboBox *)widget()),TQT_SIGNAL(activated( int )),this,TQT_SLOT(slotActivated( int )));
 	return true;
 }
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index b5515a7c..490aabb8 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -70,7 +70,7 @@ bool KviKvsObject_dialog::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 {
 	TQWidget * w = TQT_TQWIDGET(g_pApp->activeModalWidget());
 	if(!w)w = g_pFrame;
-	TQDialog * d = new TQDialog(tqparentScriptWidget() ? tqparentScriptWidget() : w,name());
+	TQDialog * d = new TQDialog(parentScriptWidget() ? parentScriptWidget() : w,name());
 	//d->setModal(true);
 	setObject(TQT_TQOBJECT(d));
 	return true;
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index 023d1e25..f741f704 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -119,23 +119,23 @@ const int align_cod[] = {
 		%inputpass=$new(lineedit,%gb)[br]
 		%inputpass->$setechomode("password")[br]
 		[br]
-		#now lets' tqlayouting the groupbox's element's.[br]
-		%tqlayoutgb=$new(tqlayout,%gb)[br]
-		%tqlayoutgb->$setmargin(20)[br]
-		%tqlayoutgb->$addwidget(%labeluser,0,0)[br]
-		%tqlayoutgb->$addwidget(%labelpass,1,0)[br]
-		%tqlayoutgb->$addwidget(%inputuser,0,1)[br]
-		%tqlayoutgb->$addwidget(%inputpass,1,1)[br]
+		#now lets' layouting the groupbox's element's.[br]
+		%layoutgb=$new(tqlayout,%gb)[br]
+		%layoutgb->$setmargin(20)[br]
+		%layoutgb->$addwidget(%labeluser,0,0)[br]
+		%layoutgb->$addwidget(%labelpass,1,0)[br]
+		%layoutgb->$addwidget(%inputuser,0,1)[br]
+		%layoutgb->$addwidget(%inputpass,1,1)[br]
 		[br]
 		# now we create a fake widget and managing the two buttons tqlayout.[br]
 		%fakewidget=$new(widget,%widget)[br]
-		%tqlayoutbtn=$new(tqlayout,%fakewidget)[br]
+		%layoutbtn=$new(tqlayout,%fakewidget)[br]
 		%btnok=$new(button,%fakewidget)[br]
 		%btnok->$settext("OK")[br]
 		%btncancel=$new(button,%fakewidget)[br]
 		%btncancel->$settext("Cancel")[br]
-		%tqlayoutbtn->$addwidget(%btnok,0,0)[br]
-		%tqlayoutbtn->$addwidget(%btncancel,0,1)[br]
+		%layoutbtn->$addwidget(%btnok,0,0)[br]
+		%layoutbtn->$addwidget(%btncancel,0,1)[br]
 		[br]
 		#And finally we create a main tqlayout with the groupbox (and its "tqchildren")[br]
 		#and fakewiget (with its buttons tqchildren).
@@ -185,11 +185,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_groupbox)
 bool KviKvsObject_groupbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 #ifdef COMPILE_USE_QT4
-	KviTalGroupBox *groupbox=new KviTalGroupBox(name(),tqparentScriptWidget());
+	KviTalGroupBox *groupbox=new KviTalGroupBox(name(),parentScriptWidget());
 	groupbox->setObjectName(name());
 	setObject(groupbox,true);
 #else
-	setObject(TQT_TQOBJECT(new KviTalGroupBox(name(),tqparentScriptWidget())), true);
+	setObject(TQT_TQOBJECT(new KviTalGroupBox(name(),parentScriptWidget())), true);
 #endif	
 	return true;
 }
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index cf855640..58c518cc 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
 bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	
-		setObject(TQT_TQOBJECT(new KviTalHBox(tqparentScriptWidget())), true);
+		setObject(TQT_TQOBJECT(new KviTalHBox(parentScriptWidget())), true);
 	return true;
 }
 bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)
@@ -116,7 +116,7 @@ bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Can't add a non-widget object"));
 		return true;
 	}
-	if(((KviKvsObject_widget *)pObject)->widget()->tqparentWidget() != widget())
+	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs("The widget must be a child of this hbox"));
 		return true;
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index fcde9a18..20184b9c 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -235,7 +235,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_label)
 
 bool KviKvsObject_label::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQLabel(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQLabel(parentScriptWidget(), name())), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index cac963b1..3cc6a0ef 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -112,7 +112,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_layout)
 
 bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	TQWidget * w = tqparentScriptWidget();
+	TQWidget * w = parentScriptWidget();
 
 	if(!w)
 	{
diff --git a/src/modules/objects/class_lcd.cpp b/src/modules/objects/class_lcd.cpp
index 539457be..3b40b64e 100644
--- a/src/modules/objects/class_lcd.cpp
+++ b/src/modules/objects/class_lcd.cpp
@@ -89,7 +89,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lcd)
 
 bool KviKvsObject_lcd::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQLCDNumber(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQLCDNumber(parentScriptWidget(), name())), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index e429adfa..8844d1b7 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -218,7 +218,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_lineedit)
 
 bool KviKvsObject_lineedit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(TQT_TQOBJECT(new TQLineEdit(tqparentScriptWidget(),getName())),true);
+	setObject(TQT_TQOBJECT(new TQLineEdit(parentScriptWidget(),getName())),true);
 	connect(widget(),TQT_SIGNAL(returnPressed()),this,TQT_SLOT(slotreturnPressed()));
 	connect(widget(),TQT_SIGNAL(lostFocus()),this,TQT_SLOT(slotlostFocus()));
 	connect(widget(),TQT_SIGNAL(textChanged(const TQString & )),this,TQT_SLOT(slottextChanged(const TQString & )));
diff --git a/src/modules/objects/class_listbox.cpp b/src/modules/objects/class_listbox.cpp
index db3920f1..241c3855 100644
--- a/src/modules/objects/class_listbox.cpp
+++ b/src/modules/objects/class_listbox.cpp
@@ -150,7 +150,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listbox)
 
 bool KviKvsObject_listbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	KviTalListBox * b = new KviTalListBox(tqparentScriptWidget());
+	KviTalListBox * b = new KviTalListBox(parentScriptWidget());
 	b->setSelectionMode(KviTalListBox::Single);
 	connect(b,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(selectionChanged()));
 	connect(b,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(currentItemChanged(KviTalListBoxItem *)));
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 036e758e..8dd485ab 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -217,7 +217,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listview)
 
 bool KviKvsObject_listview::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviKvsMdmListView(tqparentScriptWidget(),name(),this)),true);
+	setObject(TQT_TQOBJECT(new KviKvsMdmListView(parentScriptWidget(),name(),this)),true);
 	connect(widget(),TQT_SIGNAL(clicked(KviTalListViewItem *)),this,TQT_SLOT(slotClicked(KviTalListViewItem *)));
 	connect(widget(),TQT_SIGNAL(selectionChanged(KviTalListViewItem *)),this,TQT_SLOT(slotSelectionChanged(KviTalListViewItem *)));
 	connect(widget(),TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotMultipleSelectionChanged()));
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index 0834796c..f3826289 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -137,17 +137,17 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_listviewitem)
 
 bool KviKvsObject_listviewitem::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	if (!tqparentObject())
+	if (!parentObject())
 	{
-			pContext->error(__tr2qs("The listviewitem cannot be tqparentless"));
+			pContext->error(__tr2qs("The listviewitem cannot be parentless"));
 			return false;
 	}
-	if(tqparentObject()->inherits("KviKvsObject_listviewitem"))
+	if(parentObject()->inherits("KviKvsObject_listviewitem"))
 	{
-		 m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviKvsObject_listviewitem *)tqparentObject())->m_pListViewItem);
+		 m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviKvsObject_listviewitem *)parentObject())->m_pListViewItem);
 	} else {
-		if(tqparentObject()->inherits("KviKvsObject_listview"))
-			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)tqparentScriptWidget()));
+		if(parentObject()->inherits("KviKvsObject_listview"))
+			m_pListViewItem = new KviKvsMdmStandardListViewItem(this,((KviTalListView *)parentScriptWidget()));
 		else {
 			pContext->error(__tr2qs("The tqparent of the listviewitem must be either another listviewitem or a listview"));
 			return false;
diff --git a/src/modules/objects/class_mainwindow.cpp b/src/modules/objects/class_mainwindow.cpp
index 8b04053e..47c8fc68 100644
--- a/src/modules/objects/class_mainwindow.cpp
+++ b/src/modules/objects/class_mainwindow.cpp
@@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mainwindow)
 
 bool KviKvsObject_mainwindow::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalMainWindow(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new KviTalMainWindow(parentScriptWidget(), name())), true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_menubar.cpp b/src/modules/objects/class_menubar.cpp
index 860ffafc..93945979 100644
--- a/src/modules/objects/class_menubar.cpp
+++ b/src/modules/objects/class_menubar.cpp
@@ -61,7 +61,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_menubar)
 
 bool KviKvsObject_menubar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQMenuBar(tqparentScriptWidget(), name())));
+	setObject(TQT_TQOBJECT(new TQMenuBar(parentScriptWidget(), name())));
 	return true;
 }
 
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index fa9181e5..a4beed49 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -353,7 +353,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit)
 
 bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalMultiLineEdit(tqparentScriptWidget(),getName())),true);
+	setObject(TQT_TQOBJECT(new KviTalMultiLineEdit(parentScriptWidget(),getName())),true);
 	return true;
 }
 
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index 17bf5c0c..394c39a6 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
 
 bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalPopupMenu(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new KviTalPopupMenu(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotactivated(int)));
 	connect(widget(),TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slothighlighted(int)));
 	return true;
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 16ed7a42..9ec6cc5a 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -82,7 +82,7 @@
 		%tt=$new(test)[br]
 		%A=$new(widget)[br]
 		%A->$setGeometry(100,100,400,300)[br]
-		%tqlayoutA=$new(tqlayout,%A)[br]
+		%layoutA=$new(tqlayout,%A)[br]
 		%Ainput=$new(lineedit,%A)[br]
 		#%Aoutput=$new(textedit,%A)// coming soon in the new texteditor class[br]
 		%Aoutput=$new(label,%A)[br]
@@ -92,11 +92,11 @@
 		%bkill->$settext("&Kill ")[br]
 		%bterminate=$new(button,%A)[br]
 		%bterminate->$settext("&Ask to Terminate ")[br]
-		%tqlayoutA->$addwidget(%Ainput,0,0)[br]
-		%tqlayoutA->$addwidget(%Aoutput,1,0)[br]
-		%tqlayoutA->$addwidget(%bclosekill,3,0)[br]
-		%tqlayoutA->$addwidget(%bkill,4,0,)[br]
-		%tqlayoutA->$addwidget(%bterminate,5,0)[br]
+		%layoutA->$addwidget(%Ainput,0,0)[br]
+		%layoutA->$addwidget(%Aoutput,1,0)[br]
+		%layoutA->$addwidget(%bclosekill,3,0)[br]
+		%layoutA->$addwidget(%bkill,4,0,)[br]
+		%layoutA->$addwidget(%bterminate,5,0)[br]
 
 		%Process=$new(process)[br]
 		%Process->$addArg("cmd.exe")[br]
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index b75c144d..bfaa1eca 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -96,11 +96,11 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_progressbar)
 bool KviKvsObject_progressbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {	
 	#ifdef COMPILE_USE_QT4
-		Q3ProgressBar *pbar=new Q3ProgressBar(tqparentScriptWidget());
+		Q3ProgressBar *pbar=new Q3ProgressBar(parentScriptWidget());
 		pbar->setObjectName(name());
 		setObject(pbar,true);
 	#else
-		setObject(TQT_TQOBJECT(new TQProgressBar(tqparentScriptWidget(), name())), true);
+		setObject(TQT_TQOBJECT(new TQProgressBar(parentScriptWidget(), name())), true);
 	#endif	
 return true;
 }
diff --git a/src/modules/objects/class_radiobutton.cpp b/src/modules/objects/class_radiobutton.cpp
index 75a20f52..204909ae 100644
--- a/src/modules/objects/class_radiobutton.cpp
+++ b/src/modules/objects/class_radiobutton.cpp
@@ -82,7 +82,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_radiobutton)
 
 bool KviKvsObject_radiobutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQRadioButton(tqparentScriptWidget(),name())),true);
+	setObject(TQT_TQOBJECT(new TQRadioButton(parentScriptWidget(),name())),true);
 	connect(widget(),TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(toggled(bool)));
 	return true;
 }
diff --git a/src/modules/objects/class_slider.cpp b/src/modules/objects/class_slider.cpp
index 2357da5f..a8e3d938 100644
--- a/src/modules/objects/class_slider.cpp
+++ b/src/modules/objects/class_slider.cpp
@@ -130,7 +130,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_slider)
 
 bool KviKvsObject_slider::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQSlider(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQSlider(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
 	return true;
 }
diff --git a/src/modules/objects/class_spinbox.cpp b/src/modules/objects/class_spinbox.cpp
index 62f7df54..c7ad0922 100644
--- a/src/modules/objects/class_spinbox.cpp
+++ b/src/modules/objects/class_spinbox.cpp
@@ -132,7 +132,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_spinbox)
 
 bool KviKvsObject_spinbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQSpinBox(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQSpinBox(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(valueChanged(int)));
 	return true;
 }
diff --git a/src/modules/objects/class_tabwidget.cpp b/src/modules/objects/class_tabwidget.cpp
index 57e30a18..d30a6b67 100644
--- a/src/modules/objects/class_tabwidget.cpp
+++ b/src/modules/objects/class_tabwidget.cpp
@@ -94,7 +94,7 @@
 			%secondtab=$new(widget,%Tabwidget)
 			
 			# Now we'll create the item to put in to tab's pages.
-			%tqlayoutfirsttab=$new(tqlayout,%firsttab)
+			%layoutfirsttab=$new(tqlayout,%firsttab)
 			%labelbt=$new(label,%firsttab)
 			%labelbt->$settext(Botton Tab)
 			%labeltt=$new(label,%firsttab)
@@ -106,10 +106,10 @@
 			
 			# Now we'll give a tqlayout to all items.
 			# This also allows to use privateimpl without making buttons global variables
-			%tqlayoutfirsttab->$addwidget(%labelbt,0,0)
-			%tqlayoutfirsttab->$addwidget(%labeltt,0,1)
-			%tqlayoutfirsttab->$addwidget(%buttontb,1,0)
-			%tqlayoutfirsttab->$addwidget(%buttontt,1,1)
+			%layoutfirsttab->$addwidget(%labelbt,0,0)
+			%layoutfirsttab->$addwidget(%labeltt,0,1)
+			%layoutfirsttab->$addwidget(%buttontb,1,0)
+			%layoutfirsttab->$addwidget(%buttontt,1,1)
 			
 			# Add the page to the main tab.
 			%Tabwidget->$addTab(%firsttab,Top&Button,33)
@@ -125,15 +125,15 @@
 			}
 			
 			# We do the same work  with the second tab's page.
-			%tqlayoutsecondtab=$new(tqlayout,%secondtab)
+			%layoutsecondtab=$new(tqlayout,%secondtab)
 			%labelwp=$new(label,%secondtab)
 			%labelwp->$settext("Enjoy the new Class provided by")
-			%tqlayoutsecondtab->$addwidget(%labelwp,0,0)
+			%layoutsecondtab->$addwidget(%labelwp,0,0)
 			%labelwp->$settqalignment("Center")
 			%labelgen=$new(label,%secondtab)
 			%labelgen->$settext(Grifisx \& Noldor)
 			%labelgen->$settqalignment("Center")
-			%tqlayoutsecondtab->$addwidget(%labelgen,1,0)
+			%layoutsecondtab->$addwidget(%labelgen,1,0)
 			%Tabwidget->$addTab(%secondtab,&About,50)
 			
 			# Let's show our example. 
@@ -182,7 +182,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_tabwidget)
 
 bool KviKvsObject_tabwidget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQTabWidget(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQTabWidget(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(currentChanged(int)),this,TQT_SLOT(slotcurrentChanged(int)));
 	return true;
 }
diff --git a/src/modules/objects/class_tbrowser.cpp b/src/modules/objects/class_tbrowser.cpp
index 872a9c86..7f4de6ca 100644
--- a/src/modules/objects/class_tbrowser.cpp
+++ b/src/modules/objects/class_tbrowser.cpp
@@ -82,7 +82,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_textbrowser)
 
 bool KviKvsObject_textbrowser::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	TQTextBrowser * tb = new TQTextBrowser(tqparentScriptWidget(), name());
+	TQTextBrowser * tb = new TQTextBrowser(parentScriptWidget(), name());
 	setObject(TQT_TQOBJECT(tb), true);
 	connect(tb,TQT_SIGNAL(anchorClicked(const TQString &,const TQString &)),this,TQT_SLOT(anchorClicked(const TQString &,const TQString &)));
 	return true;
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 036c31ee..637feff7 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -79,14 +79,14 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbar)
 
 bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	if (!tqparentObject())
+	if (!parentObject())
 	{	
 		pContext->warning(__tr2qs("the toolbar cannot be a tqparent-widget!"));
 		return true;
 	}
-	if(tqparentObject()->inherits("KviKvsObject_mainwindow"))
+	if(parentObject()->inherits("KviKvsObject_mainwindow"))
 	{ 
-		setObject(TQT_TQOBJECT(new KviTalToolBar(name(), ((KviTalMainWindow *)tqparentScriptWidget()))), true);
+		setObject(TQT_TQOBJECT(new KviTalToolBar(name(), ((KviTalMainWindow *)parentScriptWidget()))), true);
 	}
 	else
 	{
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index c8efb269..57107068 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -129,7 +129,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_toolbutton)
 
 bool KviKvsObject_toolbutton::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQToolButton(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQToolButton(parentScriptWidget(), name())), true);
 	connect(widget(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked()));
 	return true;
 }
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index edec898e..d068156e 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_vbox)
 
 bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviTalVBox(tqparentScriptWidget())), true);
+	setObject(TQT_TQOBJECT(new KviTalVBox(parentScriptWidget())), true);
 	return true;
 }
 
@@ -118,7 +118,7 @@ bool KviKvsObject_vbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	if(((KviKvsObject_widget *)pObject)->widget()->tqparentWidget() != widget())
+	if(((KviKvsObject_widget *)pObject)->widget()->parentWidget() != widget())
 	{
 		c->warning(__tr2qs("The widget must be a child of this vbox"));
 		return true;
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 6790bbf6..3e6b4b6b 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -202,7 +202,7 @@ const int widgettypes_cod[] = {
 		!fn: $window.caption()
 		Returns the caption text of this widget.
 		!fn: $isTopLevel()
-		Returns '1' if this widget is a toplevel (tqparentless) one,
+		Returns '1' if this widget is a toplevel (parentless) one,
 		'0' otherwise.
 		!fn: $isVisible()
 		Returns '1' if this widget is currently visible (read: is managed
@@ -222,7 +222,7 @@ const int widgettypes_cod[] = {
 		!fn: $setFocus()
 		Sets this widget to be the one that receives keyboard events.
 		See also [classfnc]$hasFocus[/classfnc]
-		!fn: $tqparentWidget()
+		!fn: $parentWidget()
 		Returns the object id of the tqparent widget, or '0' if this
 		widget is a toplevel one.
 		!fn: $backgroundColor()
@@ -639,7 +639,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_widget)
 
 bool KviKvsObject_widget::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams)
 {
-	setObject(TQT_TQOBJECT(new TQWidget(tqparentScriptWidget(),getName())),true);
+	setObject(TQT_TQOBJECT(new TQWidget(parentScriptWidget(),getName())),true);
 	return true;
 }
 
@@ -1256,7 +1256,7 @@ bool KviKvsObject_widget::function_foregroundColor(KviKvsObjectFunctionCall *c)
 bool KviKvsObject_widget::function_parentWidget(KviKvsObjectFunctionCall *c)
 {
 	if(!widget())return true;
-	if(tqparentScriptWidget()) c->returnValue()->setHObject(tqparentObject()->handle());
+	if(parentScriptWidget()) c->returnValue()->setHObject(parentObject()->handle());
 	else
 		c->returnValue()->setHObject((kvs_hobject_t)0);
     return true;
@@ -1564,7 +1564,7 @@ bool KviKvsObject_widget::function_setWFlags(KviKvsObjectFunctionCall *c)
 #ifdef COMPILE_USE_QT4
 	widget()->setWindowFlags(sum);
 #else
-	 widget()->reparent(widget()->tqparentWidget(),sum,TQPoint(widget()->x(),widget()->y()));
+	 widget()->reparent(widget()->parentWidget(),sum,TQPoint(widget()->x(),widget()->y()));
 #endif
 	 return true;
 }
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 67226503..3ea0c13b 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -124,7 +124,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_wizard)
 
 bool KviKvsObject_wizard::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new KviKvsMdmWizard(tqparentScriptWidget(), name(),this)), true);
+	setObject(TQT_TQOBJECT(new KviKvsMdmWizard(parentScriptWidget(), name(),this)), true);
 
 	return true;
 }
diff --git a/src/modules/objects/class_workspace.cpp b/src/modules/objects/class_workspace.cpp
index 90e36876..48092775 100644
--- a/src/modules/objects/class_workspace.cpp
+++ b/src/modules/objects/class_workspace.cpp
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_workspace)
 
 bool KviKvsObject_workspace::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(TQT_TQOBJECT(new TQWorkspace(tqparentScriptWidget(), name())), true);
+	setObject(TQT_TQOBJECT(new TQWorkspace(parentScriptWidget(), name())), true);
 	return true;
 }
 
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 6b5f6e80..10117d27 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -655,7 +655,7 @@ void KviOptionsDialog::recursiveCommit(KviOptionsListViewItem *it)
 		recursiveCommit(it2);
 		it2 = (KviOptionsListViewItem *)it2->nextSibling();
 	}
-	// then the tqparents
+	// then the parents
 	if(it->m_pOptionsWidget)
 	{
 		it->m_pOptionsWidget->commit();
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 99beab90..38c5bd57 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -374,12 +374,12 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 {
 	m_pContextPopup->clear();
 
-	KviPopupListViewItem * tqparentMenu = 0;
+	KviPopupListViewItem * parentMenu = 0;
 	bool bIsMenu = false;
 
 	if(it)
 	{
-		tqparentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->tqparent());
+		parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->tqparent());
 		bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu;
 	}
 
@@ -464,7 +464,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 
 	bool bSeparatorInserted = false;
 
-//	if(!findPrologue(tqparentMenu))
+//	if(!findPrologue(parentMenu))
 //	{
 		m_pContextPopup->insertSeparator();
 		bSeparatorInserted = true;
@@ -473,7 +473,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 				__tr2qs("New Menu Prologue"),this,TQT_SLOT(contextNewPrologue()));
 //	}
 
-//	if(!findEpilogue(tqparentMenu))
+//	if(!findEpilogue(parentMenu))
 //	{
 		if(!bSeparatorInserted)m_pContextPopup->insertSeparator();
 		m_pContextPopup->insertItem(
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 4af15128..51fb91d1 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -95,7 +95,7 @@ static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		If no match for <channel>/<network> is found in the database then
 		a warning is printed unless -q is used.[br]
 		If -e is specified then <network> is not matched against the
-		nettqmasks in the database but is compared directly. This means
+		netmasks in the database but is compared directly. This means
 		that <network> must be exactly the nettqmask used to register a channel.
 	@examples:
 		[example]
@@ -144,7 +144,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		No warning on screen.
 		!fn: -e|--exactly
 		If -e is specified then <network> is not matched against the
-		nettqmasks in the database but is compared directly. This means
+		netmasks in the database but is compared directly. This means
 		that <network> must be exactly the nettqmask used to register a channel.	
 	@examples:
 		[example]
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 59c272d8..1f816ed4 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -344,7 +344,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
 				// try to find the nicknames to be notified
 				TQString szMask;
 	
-				for(KviIrcMask * m = i->user()->tqmaskList()->first();m;m = i->user()->tqmaskList()->next())
+				for(KviIrcMask * m = i->user()->maskList()->first();m;m = i->user()->maskList()->next())
 				{
 					TQString tmp = m->nick();
 					if((tmp.tqfind('*') == -1) && (tmp.tqfind('?') == -1) && (!tmp.isEmpty()))
@@ -717,7 +717,7 @@ void KviRegisteredUsersDialog::exportClicked()
 				if(!f.save(0))goto write_error;
 			}
 
-			KviPointerList<KviIrcMask> * ml = u->tqmaskList();
+			KviPointerList<KviIrcMask> * ml = u->maskList();
 			if(ml)
 			{
 				if(!f.save(ml->count()))goto write_error;
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 6fd82caa..97019154 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -208,7 +208,7 @@ void KviReguserPropertiesDialog::delClicked()
 
 
 KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
-: TQDialog(p,"reguser_tqmask_editor",true)
+: TQDialog(p,"reguser_mask_editor",true)
 {
 	m_pMask = m;
 
@@ -356,7 +356,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	g->addMultiCellWidget(l,3,3,0,1);
 
 	m_pMaskListBox = new KviTalListBox(p1);
-	connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(tqmaskCurrentChanged(KviTalListBoxItem *)));
+	connect(m_pMaskListBox,TQT_SIGNAL(currentChanged(KviTalListBoxItem *)),this,TQT_SLOT(maskCurrentChanged(KviTalListBoxItem *)));
 	m_pMaskListBox->setMinimumSize(300,200);
 
 	g->addMultiCellWidget(m_pMaskListBox,4,4,0,1);
@@ -494,7 +494,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	{
 		m_pNameEdit->setText(r->name());
 		m_pCommentEdit->setText(r->getProperty("comment"));
-		for(KviIrcMask * m = r->tqmaskList()->first();m;m = r->tqmaskList()->next())
+		for(KviIrcMask * m = r->maskList()->first();m;m = r->maskList()->next())
 		{
 			TQString mk = m->nick();
 			mk += TQChar('!');
@@ -555,7 +555,7 @@ KviRegisteredUserEntryDialog::~KviRegisteredUserEntryDialog()
 	delete m_pCustomColor;
 }
 
-void KviRegisteredUserEntryDialog::tqmaskCurrentChanged(KviTalListBoxItem *it)
+void KviRegisteredUserEntryDialog::maskCurrentChanged(KviTalListBoxItem *it)
 {
 	m_pDelMaskButton->setEnabled(it);
 	m_pEditMaskButton->setEnabled(it);
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 0318dbdd..cba94c50 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -147,7 +147,7 @@ protected slots:
 	void delMaskClicked();
 	void editMaskClicked();
 	void editAllPropertiesClicked();
-	void tqmaskCurrentChanged(KviTalListBoxItem *it);
+	void maskCurrentChanged(KviTalListBoxItem *it);
 };
 
 
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index b8363175..86bac9f7 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -73,11 +73,11 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 		[fnc]$reguser.list[/fnc]: lists the entries[br]
 		[cmd]reguser.setproperty[/cmd]: sets a property associated to an entry[br]
 		[cmd]reguser.edit[/cmd]: shows an editor for an user entry
-		[fnc]$reguser.match[/fnc](): finds an entry by matching tqmasks[br]
-		[fnc]$reguser.exactMatch[/fnc](): finds an entry by comparing tqmasks[br]
+		[fnc]$reguser.match[/fnc](): finds an entry by matching masks[br]
+		[fnc]$reguser.exactMatch[/fnc](): finds an entry by comparing masks[br]
 		[fnc]$reguser.property[/fnc](): finds a property associated to an entry[br]
 		[fnc]$reguser.matchProperty[/fnc](): shortcut for [fnc]$reguser.property[/fnc]([fnc]$reguser.match[/fnc]())[br]
-		[fnc]$reguser.tqmask[/fnc](): returns the registration tqmasks for an entry
+		[fnc]$reguser.tqmask[/fnc](): returns the registration masks for an entry
 */
 
 /*
@@ -155,7 +155,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		Adds a new entry with the specified <name> to the database.[br]
 		If the database contains an entry with the same <name>, this command just prints
 		a warning and returns.[br]
-		If no [tqmask] is given the new entry has no registration tqmasks: so it can't be "matched" yet. You have to add
+		If no [tqmask] is given the new entry has no registration masks: so it can't be "matched" yet. You have to add
 		at least one tqmask with [cmd]reguser.addtqmask[/cmd].
 		If [tqmask] is given, then it is added to the entry tqmask list.[br]
 		The <name> parameter may contain any character: even spaces are allowed (obviously you have to
@@ -293,7 +293,7 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		reguser.addtqmask [-f] <name> <tqmask>
 	@description:
 		Adds a registration tqmask to the database entry with name <name>.[br]
-		The <tqmask> has the common [doc:irc_tqmasks]irc tqmask[/doc] format.[br]
+		The <tqmask> has the common [doc:irc_masks]irc tqmask[/doc] format.[br]
 		The only restriction on the <tqmask> is that it must be unique inside the
 		regusers database: you can't match two users with the same tqmask (it would
 		have rather undefined results).[br]
@@ -301,7 +301,7 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		and associates is to THIS registered user (breaking the previous associations).<br>
 		Once at least one tqmask has been added, the user can be "matched"
 		by using the [fnc]$reguser.match[/fnc]() function.[br]
-		Each database entry can have an unlimited number of tqmasks.[br]
+		Each database entry can have an unlimited number of masks.[br]
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] "Szymon Stefanek"
@@ -370,7 +370,7 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 		reguser.deltqmask <tqmask>
 	@description:
 		Removes a tqmask from the regusers database.[br]
-		Since tqmasks are unique in the database , you don't need to pass
+		Since masks are unique in the database , you don't need to pass
 		an <user> parameter: if an <user> entry has the <tqmask>, removing that <tqmask>
 		will surely remove it from that <user> entry. (contorsions ?)[br]
 	@examples:
@@ -720,13 +720,13 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 	@title:
 		$reguser.list
 	@short:
-		Get a list of registered user tqmasks
+		Get a list of registered user masks
 	@syntax:
 		$reguser.list([tqmask])
 	@description:
 		Returns an array of the entries in the registered users database.[br]
 		If <tqmask> is specified, only entries matching the <tqmask>
-		and the entries with no registration tqmasks are listed.[br]
+		and the entries with no registration masks are listed.[br]
 		Please note that <tqmask> is a wildcard string that will match
 		wildcard strings... don't get messed with that :D[br]
 	@seealso:
@@ -758,7 +758,7 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 
 	while(KviRegisteredUser * u = it.current())
 	{
-		KviPointerList<KviIrcMask> * ml = u->tqmaskList();
+		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(tqmask) || (ml->count() == 0))
 		{
 			pArray->set(aid,new KviKvsVariant(u->name()));
@@ -785,7 +785,7 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	@description:
 		Lists the entries in the registered users database.[br]
 		If <tqmask> is specified, only entries matching the <tqmask>
-		and the entries with no registration tqmasks are listed.[br]
+		and the entries with no registration masks are listed.[br]
 		Please note that <tqmask> is a wildcard string that will match
 		wildcard strings... don't get messed with that :D[br]
 	@seealso:
@@ -813,14 +813,14 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	KviPointerHashTableIterator<TQString,KviRegisteredUser> it(*d);
 	while(KviRegisteredUser * u = it.current())
 	{
-		KviPointerList<KviIrcMask> * ml = u->tqmaskList();
+		KviPointerList<KviIrcMask> * ml = u->maskList();
 		if(u->matches(tqmask) || (ml->count() == 0))
 		{
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" User: %c%Q"),KVI_TEXT_BOLD,&(u->name()));
 
 			if(ml->count() == 0)
 			{
-				c->window()->output(KVI_OUT_SYSTEMWARNING,__tr2qs("    Warning: this user has no registration tqmasks"));
+				c->window()->output(KVI_OUT_SYSTEMWARNING,__tr2qs("    Warning: this user has no registration masks"));
 			} else {
 				for(KviIrcMask * m = ml->first();m;m = ml->next())
 				{
@@ -862,7 +862,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 		$reguser.match(<user_tqmask>)
 	@description:
 		Returns the name of the first entry matching <user_tqmask> in the registered user database.[br]
-		The <user_tqmask> has the common [doc:irc_tqmasks]irc tqmask[/doc] format but can't contain wildcards.[br]
+		The <user_tqmask> has the common [doc:irc_masks]irc tqmask[/doc] format but can't contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
@@ -899,7 +899,7 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 		$reguser.exactMatch(<user_tqmask>)
 	@description:
 		Returns the name of the registered user database entry that has <user_tqmask> in its registration tqmask list.[br]
-		The <user_tqmask> has the common [doc:irc_tqmasks]wild irc tqmask[/doc] format and can contain wildcards.[br]
+		The <user_tqmask> has the common [doc:irc_masks]wild irc tqmask[/doc] format and can contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
@@ -934,7 +934,7 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 //	@syntax:
 //		$reguser.matches(<user_tqmask>)
 //	@description:
-//		Returns a comma separated list of registered user tqmasks that match <user_tqmask>.[br]
+//		Returns a comma separated list of registered user masks that match <user_tqmask>.[br]
 //		User tqmask must be in the format <nick>!<user>@<host> , where <user> and
 //		<host> may contain '*' wildcards.[br]
 //		If no registered tqmask matches the <user_tqmask> an empty string is returned.[br]
@@ -983,14 +983,14 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	@title:
 		$reguser.tqmask
 	@short:
-		Returns the registration tqmasks for a db entry
+		Returns the registration masks for a db entry
 	@syntax:
 		$reguser.tqmask(<name>[,<N>])
 	@description:
 		Returns the <N>th registration tqmask for the registered user database record identified
-		by <name>. If <N> is not given , returns an array of registration tqmasks for that entry.[br]
+		by <name>. If <N> is not given , returns an array of registration masks for that entry.[br]
 		If <name> does not identify a valid entry an empty string is returned;
-		if <N> is out of range (or there are no tqmasks at all) , an empty string is returned.[br]
+		if <N> is out of range (or there are no masks at all) , an empty string is returned.[br]
 		<N> is a ZERO BASED index.[br]
 	@examples:
 		[example]
@@ -1027,11 +1027,11 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
 		KviStr n = szName;
 		if(n.hasData() && n.isUnsignedNum())
 		{
-			KviIrcMask * m = u->tqmaskList()->at(n.toInt());
+			KviIrcMask * m = u->maskList()->at(n.toInt());
 			if(m) c->returnValue()->setString(m->nick()+"!"+m->user()+"@"+m->host());
 		} else {
 			int id=0;
-			for(KviIrcMask * m = u->tqmaskList()->first();m;m = u->tqmaskList()->next())
+			for(KviIrcMask * m = u->maskList()->first();m;m = u->maskList()->next())
 			{
 				pArray->set(aid,new KviKvsVariant(TQString(m->nick()+"!"+m->user()+"@"+m->host())));
 				aid++;
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 8d61617e..75693b35 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -109,7 +109,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pPage2Layout->setMargin( 8 );
 
     m_pLabel2 = new TQLabel( m_pPage2);
-    m_pLabel2->setText(__tr2qs("<p>A registered user is identified by one or more <b>IRC tqmasks</b>.<br>A tqmask must be in the following form:<br><b>nickname!username@hostname</b><br>and can contain wildcard characters '*' and '?'. Be careful in choosing the tqmasks, as they are the only way to verify the identity of a registered user.<br><br>You can enter at most two tqmasks here, if you wish to add more tqmasks, use the \"<b>Edit</b>\" button in the Registered Users dialog. You must enter at least one tqmask.</p>"));
+    m_pLabel2->setText(__tr2qs("<p>A registered user is identified by one or more <b>IRC masks</b>.<br>A tqmask must be in the following form:<br><b>nickname!username@hostname</b><br>and can contain wildcard characters '*' and '?'. Be careful in choosing the masks, as they are the only way to verify the identity of a registered user.<br><br>You can enter at most two masks here, if you wish to add more masks, use the \"<b>Edit</b>\" button in the Registered Users dialog. You must enter at least one tqmask.</p>"));
 
     m_pPage2Layout->addMultiCellWidget(m_pLabel2,0,0,0,4);
 
@@ -117,23 +117,23 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	//tqmask.tqmask(szMask,11);
 
-	//KviIrcMask tqmasktempl(szMask.ptr());
+	//KviIrcMask masktempl(szMask.ptr());
 
     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
     m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight);
 	if(tqmask.nick() != "*")m_pNicknameEdit1->setText(tqmask.nick());
-	connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(tqmaskChanged(const TQString &)));
+	connect(m_pNicknameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
 
     m_pUsernameEdit1 = new TQLineEdit(m_pPage2);
     m_pUsernameEdit1->tqsetAlignment(TQt::AlignHCenter);
 	if(tqmask.hasUser())m_pUsernameEdit1->setText(tqmask.user());
-	connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(tqmaskChanged(const TQString &)));
+	connect(m_pUsernameEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
     m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
 
 	m_pHostEdit1 = new TQLineEdit(m_pPage2);
 	if(tqmask.hasHost())m_pHostEdit1->setText(tqmask.host());
-	connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(tqmaskChanged(const TQString &)));
+	connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
     m_pNicknameEdit2 = new TQLineEdit(m_pPage2);
@@ -255,7 +255,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	setFinishEnabled(m_pPage5,true);
 	TQString dummy;
-	tqmaskChanged(dummy);
+	maskChanged(dummy);
 	realNameChanged(dummy);
 	notifyCheckToggled(false);
 
@@ -391,7 +391,7 @@ void KviRegistrationWizard::showEvent(TQShowEvent *e)
 	KviTalWizard::showEvent(e);
 }
 
-void KviRegistrationWizard::tqmaskChanged(const TQString &)
+void KviRegistrationWizard::maskChanged(const TQString &)
 {
 	KviStr tmp1 = m_pNicknameEdit1->text();
 	KviStr tmp2 = m_pUsernameEdit1->text();
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index 23cb4572..209eaabc 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -82,7 +82,7 @@ protected:
 	virtual void reject();
 protected slots:
 	void realNameChanged(const TQString &str);
-	void tqmaskChanged(const TQString &str);
+	void maskChanged(const TQString &str);
 	void notifyNickChanged(const TQString &);
 	void notifyCheckToggled(bool);
 };
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index d81524af..df684023 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -420,7 +420,7 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c)
 		identifier of the object called, <function> is the function to be executed
 		on the remote object and <parameter1>,<parameter2>,... is the list of
 		parameters to be passed. The <function> name must contain the
-		trailing tqparenthesis and parameter specification (see examples).
+		trailing parenthesis and parameter specification (see examples).
 		The parameters MUST be in the form "type=value"
 		where "type" is the C++ type of the parameter and value
 		is the string rappresentation of the parameter data. Currently
diff --git a/src/modules/tip/libkvitip_it.kvc b/src/modules/tip/libkvitip_it.kvc
index 481e7e34..edabad68 100644
--- a/src/modules/tip/libkvitip_it.kvc
+++ b/src/modules/tip/libkvitip_it.kvc
@@ -6,7 +6,7 @@ TranslatorHint=This-file-MUST-be-encoded-in-UTF8
 1=IPv6 ora è supportato completamente, anche per le connessioni DCC.<br>Il comando è <b>/server -i &lt;nomeserver&gt;</b> :)
 2=KVIrc supporta crittazione SSL.<br>Le connessioni IRC crittate con SSL possono essere stabilite usando <b>/server -s</b>, e connessioni DCC usando <b>/dcc.chat -s</b><br>Funziona anche usando IPv6.
 3=Un <b>contesto IRC</b> è un set di risorse che dialogano con una singola connessione server. Ha associato una finestra <b>Console</b> che mostra i messaggi di sistema e del server.
-4=KVIrc è un'applicazione altamente modulare. I moduli sono caricati e scaricati trastqparentemente all'utente (ed anche allo scripter!). Puoi anche scrivere i tuoi moduli personali che estendono il linguaggio di scripting o aggiungono altre funzionalità.
+4=KVIrc è un'applicazione altamente modulare. I moduli sono caricati e scaricati trasparentemente all'utente (ed anche allo scripter!). Puoi anche scrivere i tuoi moduli personali che estendono il linguaggio di scripting o aggiungono altre funzionalità.
 5=Il modulo <b>gnutella</b> è stato rimosso dai sorgenti di KVIrc ed è ora distribuito in un pacchetto separato.
 6=KVIrc supporta diversi gestori per lo stesso evento. Questo permette di avere diversi script installati allo stesso momento, evitare collisioni tra gestori ed aiutare ad aggiungere/rimuovere e attivare/disattivare gli script.
 7=KVIrc supporta gli URL (Uniform Resource Locator) <b>irc://</b>. Lancia il comando:<br><b>kvirc irc://irc.tuoserver.org:6667/canale</b><br> per connettere a quel server.<br>La sintassi generale è:<br><b>irc[6]://&lt;nome-server&gt;[:&lt;porta&gt;][/[&lt;canale&gt;[?&lt;password&gt;]]]</b>
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index 3f3d9d1a..c392a7f8 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -358,7 +358,7 @@ void KviCustomizeToolBarsDialog::currentToolBarChanged()
 void KviCustomizeToolBarsDialog::showEvent(TQShowEvent * e)
 {
 //	repaintContents();
-//	TQRect r = tqparentWidget() ? tqparentWidget()->rect() : TQApplication::desktop()->rect();
+//	TQRect r = parentWidget() ? parentWidget()->rect() : TQApplication::desktop()->rect();
 //	int x = (r.width() - width()) / 2;
 //	int y = (r.height() - height()) / 2;
 //	move(x,y);