rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 15 insertions, 15 deletions

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)