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

13 files changed, 82 insertions, 82 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]Pragma!~daemon@some.host.it[/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 Pragma!~xor@233-dyn.myisp.it 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!^pragma@staff.kvirc.net[br]
 		[jazz]!~jazz@jazz.myhome.com[br]
 		luke!=skywalker@212.213.41.12[br]
 		HAN!^solo@ff0f:a0a0:1011::ea80:1[br]
 		Darth!vader@210.11.12.XXX[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!*pragma@212.101.102.*: 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          (*!~user@XXX.XXX.*)
 * 20: nick!*user@*.host.top          (nick!*user@XXX.XXX.*)
 * 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       (nick!~user@XXX.XXX.*)
 * 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          (*!~user@XXX.XXX.*)
 		NickCleanUserLargeNet = 20, // 20 : nick!*user@*.host.top          (nick!*user@XXX.XXX.*)
 		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       (nick!~user@XXX.XXX.*)
 		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 ) {