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

37 files changed, 110 insertions, 110 deletions

diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 3b2944b..3e68ec5 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 f50e6f6..d990ff5 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 0748501..d4d79a9 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 ec82da5..0553354 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 ba1f1b8..5fb5924 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 312c184..83b5e0e 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) Pragma!someuser@somehost.com 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 d3d68ec..459f024 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 : nick!user@machine.host.top  (nick!user@XXX.XXX.XXX.XXX) (default)[br]
 			1 : nick!user@*.abc.host.top        (nick!user@XXX.XXX.XXX.*)[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 cf86ed6..c79e832 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 96548ad..9fbffbd 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 6d51de2..572ea1a 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 10f2564..5d16c74 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 6b334dd..646b616 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 3d439fd..24f3ac9 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 adeef3d..ee91df4 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 d6437c7..bfb0bd5 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 0014743..4cf0cbc 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 5b592ad..6028d1d 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 11ca648..c681aa8 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 837ef84..61a4151 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 3ab8fd5..6688f5b 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 0ec0f27..24f0bdc 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 4b71c36..6a6845d 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 8ad6ffb..206cadb 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 98f9fc6..0a82449 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 6b6db20..cf7d5a7 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 b2af2cb..e551771 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 9d1ce47..b8b7903 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 e462a73..26912ef 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 6a78a70..f00100a 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 9c6c77b..47a53e8 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 08f3af2..80d0cac 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 9dcafaf..398d49e 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 cd5e84d..9577ef6 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 6401ed8..585b75b 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 6aad95b..c7d8bba 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 0030ea5..a298861 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 f86b6c2..7cc410b 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);