5 files changed, 43 insertions, 43 deletions
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/kvi_avatarcache.cpp
index 57ab53f5..77578b17 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/kvi_avatarcache.cpp
@@ -76,11 +76,11 @@ KviAvatarCache::~KviAvatarCache()
 }
 
 
-void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork)
+void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 	
@@ -96,11 +96,11 @@ void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask
 	}
 }
 
-void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
+void KviAvatarCache::remove(const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 	
@@ -109,11 +109,11 @@ void KviAvatarCache::remove(const KviIrcMask &tqmask,const TQString &szNetwork)
 
 
 
-const TQString & KviAvatarCache::lookup(const KviIrcMask &tqmask,const TQString &szNetwork)
+const TQString & KviAvatarCache::lookup(const KviIrcMask &mask,const TQString &szNetwork)
 {
 	TQString szKey;
 
-	tqmask.tqmask(szKey,KviIrcMask::NickCleanUserSmartNet);
+	mask.mask(szKey,KviIrcMask::NickCleanUserSmartNet);
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 
diff --git a/src/kvilib/irc/kvi_avatarcache.h b/src/kvilib/irc/kvi_avatarcache.h
index c245c3bc..92f6a79f 100644
--- a/src/kvilib/irc/kvi_avatarcache.h
+++ b/src/kvilib/irc/kvi_avatarcache.h
@@ -55,9 +55,9 @@ public:
 	
 	static KviAvatarCache * instance(){ return m_pAvatarCacheInstance; };
 
-	void replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork);
-	void remove(const KviIrcMask &tqmask,const TQString &szNetwork);
-	const TQString & lookup(const KviIrcMask &tqmask,const TQString &szNetwork);
+	void replace(const TQString &szIdString,const KviIrcMask &mask,const TQString &szNetwork);
+	void remove(const KviIrcMask &mask,const TQString &szNetwork);
+	const TQString & lookup(const KviIrcMask &mask,const TQString &szNetwork);
 	
 	void cleanup();
 	
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
index d18e398d..4552cc93 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/kvi_ircmask.cpp
@@ -40,7 +40,7 @@
 		irc masks , nickname , username , hostname , wildcard
 	@body:
 		[big]Simple masks[/big][br]
-		An irc tqmask is a string in a special format that identifies an user on irc.[br]
+		An irc mask is a string in a special format that identifies an user on irc.[br]
 		The standard basic format is:[br]
 		[b]<nick>!<username>@<host>[/b][br]
 		The <nick> part contains the nickname with that the user is widely known across the network.[br]
@@ -81,7 +81,7 @@
 		The wild masks are used to "match" an user within a set of them.[br]
 		'*' matches any sequence (eventually empty) of characters and '?' matches a single character.[br]
 		Wildcards are allowed only in the <nick> , <user> and <host> part: so the
-		"wildest" tqmask possible is:[br]
+		"wildest" mask possible is:[br]
 		[b]*!*@*[/b][br]
 		that designates "any nickname, any username on any host".[br]
 		Here are some examples of wild masks:[br]
@@ -315,8 +315,8 @@ bool KviIrcMask::hasNumericHost() const
 
 
 /**
-* Retuns in szMask the specified (if possible) tqmask of this user.<br>
-* If the host or username are not known , the tqmask may contain less information
+* Retuns in szMask the specified (if possible) mask of this user.<br>
+* If the host or username are not known , the mask may contain less information
 * than requested.<br>
 * Mask types:<br>
 * 0 : nick!user@machine.host.top  (nick!user@XXX.XXX.XXX.XXX) (default)<br>
@@ -349,7 +349,7 @@ bool KviIrcMask::hasNumericHost() const
 * 25: nick!*user@*.host.top          (nick!*user@XXX.XXX.*)
 * 26: *!*user@*.host.top          (*!user@*XXX.XXX.*)
 * If some data is missing , these types may change:<br>
-* For example , if hostname is missing , the tqmask type 3 or 4 may be reduced to type 5
+* For example , if hostname is missing , the mask type 3 or 4 may be reduced to type 5
 */
 
 /*
@@ -365,10 +365,10 @@ bool KviIrcMask::hasNumericHost() const
 
 static unsigned char maskTable[27][3] = {
 	{ 0 , 0 , 0 }, //0 means normal block
-	{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host tqmask
+	{ 0 , 0 , 2 }, //2 in the third field means type *.abc.host.top (or XXX.XXX.XXX.*) host mask
 	{ 0 , 0 , 1 }, //2 in the second field means *user (strip prefixes)
 	{ 0 , 1 , 0 }, //1 means *
-	{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host tqmask
+	{ 0 , 1 , 2 }, //3 in the third field means type *.host.top (or XXX.XXX.*) host mask
 	{ 0 , 1 , 1 }, //4 in the third field is like 3 but tries to detect masked ip addresses too
 	{ 1 , 0 , 0 },
 	{ 1 , 0 , 2 },
@@ -393,7 +393,7 @@ static unsigned char maskTable[27][3] = {
 	{ 1 , 2 , 4 }
 };
 
-void KviIrcMask::tqmask(TQString &szMask,MaskType eMaskType) const
+void KviIrcMask::mask(TQString &szMask,MaskType eMaskType) const
 {
 	if((((int)eMaskType) > 26)||(((int)eMaskType) < 0))eMaskType = NickUserHost;
 	szMask = maskTable[((int)eMaskType)][0] ? m_szWild : m_szNick;
@@ -556,25 +556,25 @@ bool KviIrcMask::matchedBy(const TQString &szMask) const
 }
 */
 
-bool KviIrcMask::matches(const KviIrcMask &tqmask) const
+bool KviIrcMask::matches(const KviIrcMask &mask) const
 {
-	if(KviTQString::matchWildExpressionsCI(m_szNick,tqmask.m_szNick))
+	if(KviTQString::matchWildExpressionsCI(m_szNick,mask.m_szNick))
 	{
-		if(KviTQString::matchWildExpressionsCI(m_szUser,tqmask.m_szUser))
+		if(KviTQString::matchWildExpressionsCI(m_szUser,mask.m_szUser))
 		{
-			if(KviTQString::matchWildExpressionsCI(m_szHost,tqmask.m_szHost))return true;
+			if(KviTQString::matchWildExpressionsCI(m_szHost,mask.m_szHost))return true;
 		}
 	}
 	return false;
 }
 
-bool KviIrcMask::matchesFixed(const KviIrcMask &tqmask) const
+bool KviIrcMask::matchesFixed(const KviIrcMask &mask) const
 {
-	if(KviTQString::matchStringCI(m_szNick,tqmask.m_szNick,0,1))
+	if(KviTQString::matchStringCI(m_szNick,mask.m_szNick,0,1))
 	{
-		if(KviTQString::matchStringCI(m_szUser,tqmask.m_szUser,0,1))
+		if(KviTQString::matchStringCI(m_szUser,mask.m_szUser,0,1))
 		{
-			if(KviTQString::matchStringCI(m_szHost,tqmask.m_szHost,0,1))return true;
+			if(KviTQString::matchStringCI(m_szHost,mask.m_szHost,0,1))return true;
 		}
 	}
 	return false;
@@ -609,7 +609,7 @@ bool KviIrcMask::matchesFixed(const TQString &nick,const TQString &user,const TQ
 	return true;
 }
 
-//Internals for tqmask()
+//Internals for mask()
 
 int KviIrcMask::getIpDomainMaskLen() const
 {
diff --git a/src/kvilib/irc/kvi_ircmask.h b/src/kvilib/irc/kvi_ircmask.h
index 4efac627..5566a424 100644
--- a/src/kvilib/irc/kvi_ircmask.h
+++ b/src/kvilib/irc/kvi_ircmask.h
@@ -3,7 +3,7 @@
 
 //=============================================================================
 //
-//   File : kvi_irctqmask.h
+//   File : kvi_ircmask.h
 //   Creation date : Fri Jan 8 1999 19:50:35 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
@@ -33,7 +33,7 @@
 #include "kvi_qstring.h"
 
 //=============================================================================
-// Irc user tqmask abstraction
+// Irc user mask abstraction
 //=============================================================================
 
 class KVILIB_API KviIrcMask : public KviHeapObject
@@ -56,14 +56,14 @@ public:
 	// Sets the host for this user.<br>
 	// If szHost is NULL or it points to an empty string the host is set to "*".<br>
 	void setHost(const TQString &szHost){ m_szHost = szHost.isEmpty() ? m_szWild : szHost; };
-	// Sets the host , nick and username extracting it from an irc tqmask:<br>
+	// Sets the host , nick and username extracting it from an irc mask:<br>
 	// nick!user@host<br>
-	// The tqmask is terminated by end-of string null character or a character equal to c in the string.<br>
-	// Returns the pointer to the end of the tqmask in the szMask string.(c or null-terminator)<br>
+	// The mask is terminated by end-of string null character or a character equal to c in the string.<br>
+	// Returns the pointer to the end of the mask in the szMask string.(c or null-terminator)<br>
 	//const char * setMask(const TQString &szMask,char c=' ');
-	// Sets the host , nick and username extracting it from an userhost tqmask:<br>
+	// Sets the host , nick and username extracting it from an userhost mask:<br>
 	// nick[*]=<+|->user@host<br>
-	// The tqmask is terminated by end-of string null char or a space character.<br>
+	// The mask is terminated by end-of string null char or a space character.<br>
 	// Returns the pointer to the next non-space char in the szMask string or to the null-terminator<br>
 	// If there are no more masks avaiable.
 	// WARNING : the szMask pointer can NOT be NULL
@@ -80,8 +80,8 @@ public:
 	bool hasHost() const { return !(m_szHost.isEmpty() || (m_szHost == m_szWild)); };
 
 	bool hasNumericHost() const;
-	// Retuns in szMask the specified (if possible) tqmask of this user.<br>
-	// If the host or username are not known , the tqmask may contain less information
+	// Retuns in szMask the specified (if possible) mask of this user.<br>
+	// If the host or username are not known , the mask may contain less information
 	// than requested.<br>
 
 	enum MaskType
@@ -117,7 +117,7 @@ public:
 		CleanUserSmartNet = 26      // 26 : *!*user@*.host.top          (*!user@*XXX.XXX.*)
 	};
 	
-	void tqmask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
+	void mask(TQString &szMask,MaskType eMaskType = NickCleanUserHost) const;
 	bool hasWildNick();
 
 	// Wild external matches (this and external are wild)
@@ -125,24 +125,24 @@ public:
 //	bool matches(const char *szMask);
 //	// passing 0 as one of params here means that it is a match by default
 //	bool matches(const char *nick,const char *user,const char *host);
-	bool matches(const KviIrcMask &tqmask) const;
+	bool matches(const KviIrcMask &mask) const;
 
 
 	// Fixed external matches  (this is wild , external is fixed)
 	bool matchesFixed(const TQString &nick,const TQString &user,const TQString &host) const;
 //	bool matchesFixed(const TQString &szMask) const;
-	bool matchesFixed(const KviIrcMask &tqmask) const;
+	bool matchesFixed(const KviIrcMask &mask) const;
 
 	// Fixed internal matches (this is fixed , external is wild)
 	//bool matchedBy(const TQString &szMask) const;
-	bool matchedBy(const KviIrcMask &tqmask) const { return tqmask.matchesFixed(*this); };
+	bool matchedBy(const KviIrcMask &mask) const { return mask.matchesFixed(*this); };
 
 	int nonWildChars();
 	bool operator==(const KviIrcMask &user);
 public:
-	// Constructs an empty tqmask (*!*@*)
+	// Constructs an empty mask (*!*@*)
 	KviIrcMask();
-	// Constructs this KviIrcMask object from a string tqmask
+	// Constructs this KviIrcMask object from a string mask
 	KviIrcMask(const TQString &szMask);
 	// Carbon copy
 	KviIrcMask(const KviIrcMask &ircUser)
diff --git a/src/kvilib/irc/kvi_nickserv.h b/src/kvilib/irc/kvi_nickserv.h
index f259f1f5..5ed6bb43 100644
--- a/src/kvilib/irc/kvi_nickserv.h
+++ b/src/kvilib/irc/kvi_nickserv.h
@@ -36,10 +36,10 @@ class KVILIB_API KviNickServRule : public KviHeapObject
 {
 protected:
 	TQString m_szRegisteredNick;         // my registered nickname
-	TQString m_szNickServMask;           // the NickServ service tqmask
+	TQString m_szNickServMask;           // the NickServ service mask
 	TQString m_szMessageRegexp;          // the NickServ message regexp
 	TQString m_szIdentifyCommand;        // the IDENTIFY command to send to server
-	TQString m_szServerMask;             // the tqmask that the server must match (not used in per-network rules)
+	TQString m_szServerMask;             // the mask that the server must match (not used in per-network rules)
 public:
 	KviNickServRule() : KviHeapObject() {};
 	KviNickServRule(