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
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
commit: 9ca32ef31a2566af48c06f258722738df92366af (patch)
tree: c847db3bf1bb88b7863fed0cc60eef6bf641306a /src/modules
parent: 72aaee9802d447ee21340b011856b9b355a58f1a (diff)
download: kvirc-9ca32ef31a2566af48c06f258722738df92366af.tar.gz
kvirc-9ca32ef31a2566af48c06f258722738df92366af.zip
131 files changed, 814 insertions, 814 deletions
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 70fc661b..e7bd5d75 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -822,7 +822,7 @@ bool KviAliasEditor::removeItem(KviAliasEditorListViewItem *it,bool * pbYesToAll
 	{
 		while(it)
 		{
-			KviAliasEditorListViewItem * par = (KviAliasEditorListViewItem *)(it->tqparent());
+			KviAliasEditorListViewItem * par = (KviAliasEditorListViewItem *)(it->parent());
 			delete it;
 			if(par)
 			{
@@ -992,10 +992,10 @@ TQString KviAliasEditor::askForNamespaceName(const TQString &szAction,const TQSt
 
 void KviAliasEditor::openParentItems(KviTalListViewItem * it)
 {
-	if(it->tqparent())
+	if(it->parent())
 	{
-		it->tqparent()->setOpen(true);
-		openParentItems(it->tqparent());
+		it->parent()->setOpen(true);
+		openParentItems(it->parent());
 	}
 }
 
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 174f28be..a540e238 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1029,21 +1029,21 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns an array of channel user nicknames
 	@syntax:
-		<array> $chan.users([window_id:string],[tqmask:string],[flags:string])
+		<array> $chan.users([window_id:string],[mask:string],[flags:string])
 	@description:
 		Returns an array of nicknames on the channel specified 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]
-		If [tqmask] is given, each user is added to the array only
-		if it matches the [tqmask].[br]
+		If [mask] is given, each user is added to the array only
+		if it matches the [mask].[br]
 		[flags] may contain a subset of the letters "aovhnmi":[br]
 		"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 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):
+		The flag 'i' causes KVIrc to invert the match and add only the users that do NOT match [mask].[br]
+		Please note that on really large channels this function may be time consuming (especially if [mask] is used):
 		use with care.[br]
 	@example:
 		[example]
@@ -1069,7 +1069,7 @@ static bool chan_kvs_fnc_limit(KviKvsModuleFunctionCall * c)
 			%test[] = $chan.users(,,o)
 			echo %test[]
 			[comment]# Find all the voiced users that do NOT come from *.edu[/comment]
-			[comment]# See also their whole tqmask[/comment]
+			[comment]# See also their whole mask[/comment]
 			%test[] = $chan.users(,*!*@*.edu,vim)
 			echo %test[]
 		[/example]
@@ -1081,7 +1081,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask,szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,KVS_PF_OPTIONAL,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
 		KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
 
@@ -1108,7 +1108,7 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 	if(bAddMask || bCheckFlags || bCheckMask)
 	{
 		bool bMaskMustMatch = szFlags.find('i',false) == -1;
-		KviIrcMask tqmask(szMask);
+		KviIrcMask mask(szMask);
 
 		while(e)
 		{
@@ -1116,34 +1116,34 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 			{
 				if(bChanAdmins)
 				{
-					if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_CHANADMIN)goto check_mask;
 				}
 				if(bOp)
 				{
-					if(e->flags() & KVI_USERFLAG_OP)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_OP)goto check_mask;
 				}
 				if(bVoice)
 				{
-					if(e->flags() & KVI_USERFLAG_VOICE)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_VOICE)goto check_mask;
 				}
 				if(bHalfOp)
 				{
-					if(e->flags() & KVI_USERFLAG_HALFOP)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_HALFOP)goto check_mask;
 				}
 				if(bUserOp)
 				{
-					if(e->flags() & KVI_USERFLAG_USEROP)goto check_tqmask;
+					if(e->flags() & KVI_USERFLAG_USEROP)goto check_mask;
 				}
 				if(bNone)
 				{
-					if(!(e->flags() & KVI_USERFLAG_MASK))goto check_tqmask;
+					if(!(e->flags() & KVI_USERFLAG_MASK))goto check_mask;
 				}
 				goto next_item;
 			}
-check_tqmask:
+check_mask:
 			if(bCheckMask)
 			{
-				if(tqmask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item;
+				if(mask.matchesFixed(e->nick(),e->globalData()->user(),e->globalData()->host()) == bMaskMustMatch)goto add_item;
 				goto next_item;
 			}
 add_item:
@@ -1311,12 +1311,12 @@ static bool chan_kvs_fnc_invitelist(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchban
 	@short:
-		Matches a tqmask agains the channel ban list
+		Matches a mask agains the channel ban list
 	@syntax:
-		<string> $chan.matchban([window_id],<complete_tqmask>)
+		<string> $chan.matchban([window_id],<complete_mask>)
 	@description:
-		Returns the ban tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
-		If no ban tqmask matches <complete_tqmask> an empty string is returned.[br]
+		Returns the ban mask that matches <complete_mask> on channel identified by [window_id].[br]
+		If no ban mask matches <complete_mask> an empty string is returned.[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 string is returned.[br]
 		This function is useful to determine if a ban set on the channel matches an user.[br]
@@ -1327,7 +1327,7 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@@ -1360,12 +1360,12 @@ static bool chan_kvs_fnc_matchban(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchbanexception
 	@short:
-		Matches a tqmask agains the channel ban exception list
+		Matches a mask agains the channel ban exception list
 	@syntax:
-		<string> $chan.matchbanexception([window_id],<complete_tqmask>)
+		<string> $chan.matchbanexception([window_id],<complete_mask>)
 	@description:
-		Returns the ban exception tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
-		If no ban exception tqmask matches <complete_tqmask> an empty string is returned.[br]
+		Returns the ban exception mask that matches <complete_mask> on channel identified by [window_id].[br]
+		If no ban exception mask matches <complete_mask> an empty string is returned.[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 string is returned.[br]
 		This function is useful to determine if a ban exception set on the channel matches an user.[br]
@@ -1376,7 +1376,7 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
@@ -1409,12 +1409,12 @@ static bool chan_kvs_fnc_matchbanexception(KviKvsModuleFunctionCall * c)
 	@title:
 		$chan.matchinvite
 	@short:
-		Matches a tqmask agains the channel invite list
+		Matches a mask agains the channel invite list
 	@syntax:
-		<string> $chan.matchinvite([window_id:string],<complete_tqmask>)
+		<string> $chan.matchinvite([window_id:string],<complete_mask>)
 	@description:
-		Returns the invite tqmask that matches <complete_tqmask> on channel identified by [window_id].[br]
-		If no invite tqmask matches <complete_tqmask> an empty string is returned.[br]
+		Returns the invite mask that matches <complete_mask> on channel identified by [window_id].[br]
+		If no invite mask matches <complete_mask> an empty string is returned.[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 string is returned.[br]
 		This function is useful to determine if a invite set on the channel matches an user.[br]
@@ -1425,7 +1425,7 @@ static bool chan_kvs_fnc_matchinvite(KviKvsModuleFunctionCall * c)
 	TQString szWinId,szMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("window id",KVS_PT_STRING,0,szWinId)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 
 	KviChannel * ch = chan_kvs_find_channel(c,szWinId);
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index b05bb5a7..fc3428bd 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -200,7 +200,7 @@ void KviChannelsJoinWindow::fillListView()
 void KviChannelsJoinWindow::itemClicked(KviTalListViewItem * it) 
 {
 	if(!it)return;
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 	KviStr tmp = it->text(0);
 	m_pChannelEdit->setText(tmp.ptr());
 	enableJoin();
@@ -209,7 +209,7 @@ void KviChannelsJoinWindow::itemClicked(KviTalListViewItem * it)
 void KviChannelsJoinWindow::itemDoubleClicked(KviTalListViewItem * it) 
 {
 	if(!it)return;
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 	KviStr tmp = it->text(0);
 	m_pChannelEdit->setText(tmp.ptr());
 	enableJoin();
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 09778d76..7e41034b 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -714,7 +714,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 				kvi_free(data->buffer);
 				data->buffer = end = aux = 0;
 			}
-			postEvent(tqparent(),e);
+			postEvent(parent(),e);
 		} else aux++;
 //		debug("PASSING CHAR %c",*aux);
 	}
@@ -732,7 +732,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 			data->iLen = 0;
 			kvi_free(data->buffer);
 			data->buffer = 0;
-			postEvent(tqparent(),e);
+			postEvent(parent(),e);
 		}
 	}
 	return true;
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 3cb5a7c7..93274b40 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -862,7 +862,7 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 		The remote end may acknowledge the request by sending a DCC RECV request.
 		This command effects are similar to [cmd]dcc.send[/cmd], but will work also on machines
 		that can't accept incoming connections (firewalling or masquerading problems).[br]
-		A 120 seconds file offer is added for the specified file and tqmask "<nickname>!*@*".
+		A 120 seconds file offer is added for the specified file and mask "<nickname>!*@*".
 	@examples:
 
 */
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 4eed2393..00a1d1e7 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -878,7 +878,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 			// now add a file offer , so he we will accept it automatically
 			// 120 secs is a reasonable timeout
 			TQString szMask;
-			dcc->ctcpMsg->pSource->tqmask(szMask,KviIrcMask::NickUserHost);
+			dcc->ctcpMsg->pSource->mask(szMask,KviIrcMask::NickUserHost);
 
 			KviSharedFile * pOld = o;
 			o = g_pSharedFilesManager->addSharedFile(szFileName,o->absFilePath(),szMask,120);
@@ -1081,7 +1081,7 @@ static void dccModuleParseDccCanvas(KviDccRequest *dcc)
 
 static void dccModuleParseDccList(KviDccRequest *dcc)
 {
-	// DCC LIST <tqmask> <ipaddr> <port>
+	// DCC LIST <mask> <ipaddr> <port>
 	// FIXME!
 }
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 74586112..a7485ca2 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -158,7 +158,7 @@ void KviDccRecvThread::postMessageEvent(const char * m)
 {
 	KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
 	e->setData(new KviStr(m));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 }
 
 // FIXME: This stuff should be somewhat related to the 1448 bytes TCP basic packet size
@@ -292,7 +292,7 @@ void KviDccRecvThread::run()
 								{
 									// Received the whole file...die
 									KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-									postEvent(tqparent(),e);
+									postEvent(parent(),e);
 									break;
 								}
 							}
@@ -327,7 +327,7 @@ void KviDccRecvThread::run()
 							{
 								// success if we got the whole file or if we don't know the file size (we trust the peer)
 								KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-								postEvent(tqparent(),e);
+								postEvent(parent(),e);
 								break;
 							}
 						}
@@ -368,7 +368,7 @@ void KviDccRecvThread::run()
 							// success if we got the whole file or if we don't know the file size (we trust the peer)
 							postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc"));
 							KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-							postEvent(tqparent(),e);
+							postEvent(parent(),e);
 							break;
 						}
 					}
@@ -572,7 +572,7 @@ void KviDccSendThread::run()
 					if(iLastAck >= pFile->size())
 					{
 						KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-						postEvent(tqparent(),e);
+						postEvent(parent(),e);
 						break;
 					}
 				} else {
@@ -589,7 +589,7 @@ void KviDccSendThread::run()
 								// done...success
 								updateStats();
 								KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-								postEvent(tqparent(),e);
+								postEvent(parent(),e);
 								break;
 							} else {
 								if(readLen < 0)
@@ -598,7 +598,7 @@ void KviDccSendThread::run()
 								} else {
 									KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
 									e->setData(new KviStr(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc")));
-									postEvent(tqparent(),e);
+									postEvent(parent(),e);
 								}
 							}
 						}
@@ -672,7 +672,7 @@ void KviDccSendThread::run()
 						// not in a tdcc: we can close the file...
 						updateStats();
 						KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-						postEvent(tqparent(),e);
+						postEvent(parent(),e);
 						break;
 					} else {
 						// upload finished but we're waiting for the last ack
diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/thread.h
index b91e2a20..7687f653 100644
--- a/src/modules/dcc/thread.h
+++ b/src/modules/dcc/thread.h
@@ -66,7 +66,7 @@ protected:
 protected:
 	bool handleInvalidSocketRead(int readLen);
 public:
-	TQObject * tqparent(){ return m_pParent; };
+	TQObject * parent(){ return m_pParent; };
 	void postErrorEvent(int err);
 	// Warning!..newer call __tr() here!...use __tr_no_lookup()
 	void postMessageEvent(const char * message);
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 4bf9ad9d..e9d8a2a6 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -533,7 +533,7 @@ void KviDccVoiceThread::startRecording()
 //		debug("Posting event");
 		KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 		e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING));
-		postEvent(tqparent(),e);
+		postEvent(parent(),e);
 
 		m_bRecording = true;
 		m_bRecordingRequestPending = false;
@@ -552,7 +552,7 @@ void KviDccVoiceThread::stopRecording()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_RECORDING));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 
 	m_bRecording = false;
 	if(!m_bPlaying)closeSoundcard();
@@ -569,7 +569,7 @@ void KviDccVoiceThread::startPlaying()
 	{
 		KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 		e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_PLAYING));
-		postEvent(tqparent(),e);
+		postEvent(parent(),e);
 		m_bPlaying = true;
 	}
 #endif
@@ -583,7 +583,7 @@ void KviDccVoiceThread::stopPlaying()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_PLAYING));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 
 	m_bPlaying = false;
 	if(!m_bRecording)closeSoundcard();
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 52b0e10f..7e3149f6 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -147,7 +147,7 @@ void KviKvsCallbackMessageBox::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will click one of the buttons. At this point the dialog
 		is hidden and the <callback_command> is executed passing the number of the button clicked
 		as $0 and the magic parameters as positional parameters $1 , $2 , $3....[br]
@@ -417,7 +417,7 @@ void KviKvsCallbackTextInput::showEvent(TQShowEvent *e)
 		If the -d switch is used , the initial text input value is set to <default text>.[br]
 		If the -i switch is used , the dialog displays also the icon <icon> , just on the left ot the <info_text>[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		In that case <icon> is an [doc:image_id]image identifier[/doc] (can be a relative or absolute
 		path to an image file or a signed number (in that case it defines an internal KVIrc image).[br]
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.textinput call time and passed
@@ -573,7 +573,7 @@ void KviKvsCallbackFileDialog::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.message call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will select an EXISTING file and click either
 		Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
 		and the magic parameters as positional parameters $1 , $2 , $3....[br]
@@ -704,7 +704,7 @@ void KviKvsCallbackImageDialog::done(int code)
 		<magic1>,<magic2>... are the magic parameters: evaluated at dialog.image call time and passed
 		to the <callback_command> as positional parameters.[br]
 		If the -b or -modal switch is specified the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.[br] 
+		it will appear above its parent widget and block its input until it's closed.[br] 
 		Once the dialog has been shown , the user will select an EXISTING file and click either
 		Ok or Cancel. At this point the dialog is hidden and the <callback_command> is executed passing the selected file(s) as $0
 		and the magic parameters as positional parameters $1 , $2 , $3....[br]
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index f734d288..8dd177cc 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -199,8 +199,8 @@ void KviDockWidget::createTaskbarIcon()
 	ICONINFO inf;
 	g_pCurrentPixmap=new TQPixmap(*g_pDock1);
 	inf.hbmColor = g_pCurrentPixmap->hbm();
-	if(!g_pCurrentPixmap->tqmask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask());
-	inf.hbmMask = g_pCurrentPixmap->tqmask()->hbm();
+	if(!g_pCurrentPixmap->mask())g_pCurrentPixmap->setMask(g_pCurrentPixmap->createHeuristicMask());
+	inf.hbmMask = g_pCurrentPixmap->mask()->hbm();
 	g_pCurrentIcon=CreateIconIndirect(&inf);
 
 	NOTIFYICONDATA nid;
@@ -229,8 +229,8 @@ void KviDockWidget::updateTaskbarIcon()
 	ICONINFO inf;
 	TQPixmap* pix = m_bFlashed ? g_pIconManager->getSmallIcon(KVI_SMALLICON_MESSAGE) : g_pCurrentPixmap;
 	inf.hbmColor = pix->hbm();
-	if(!pix->tqmask())pix->setMask(pix->createHeuristicMask());
-	inf.hbmMask = pix->tqmask()->hbm();
+	if(!pix->mask())pix->setMask(pix->createHeuristicMask());
+	inf.hbmMask = pix->mask()->hbm();
 	HICON hIcon=CreateIconIndirect(&inf);
 
 	NOTIFYICONDATA nid;
@@ -719,7 +719,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 {
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
-	// show the tqparent frame.. otherwise there will be no way to get it back
+	// show the parent frame.. otherwise there will be no way to get it back
 	if(!c->window()->frame()->isVisible())
 	{
 		c->window()->frame()->show();
diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
index 76316941..00fd0094 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
@@ -550,7 +550,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 {
 	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
-	// show the tqparent frame.. otherwise there will be no way to get it back
+	// show the parent frame.. otherwise there will be no way to get it back
 	if(!c->window()->frame()->isVisible())
 	{
 		c->window()->frame()->show();
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 1ef36b5d..8d087476 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -43,7 +43,7 @@ static bool editor_module_cleanup(KviModule *m)
 {
 	while(g_pScriptEditorWindowList->first())
 	{
-		TQObject * w = g_pScriptEditorWindowList->first()->tqparent();;
+		TQObject * w = g_pScriptEditorWindowList->first()->parent();;
 		while(w)
 		{
 			//debug("%s %s %i %s",__FILE__,__FUNCTION__,__LINE__,w->className());
@@ -54,7 +54,7 @@ static bool editor_module_cleanup(KviModule *m)
 			//	debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
 				break;
 			}
-		w = w->tqparent();
+		w = w->parent();
 		}
 		delete g_pScriptEditorWindowList->first();
 	}
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 498da234..25508d66 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -74,8 +74,8 @@ static TQColor g_clrFind(0,0,0);
 
 static TQFont g_fntNormal("Courier New",8);
 
-KviCompletionBox::KviCompletionBox(TQWidget * tqparent = 0)
-: KviTalListBox(tqparent)
+KviCompletionBox::KviCompletionBox(TQWidget * parent = 0)
+: KviTalListBox(parent)
 {
 	setPaletteForegroundColor(TQColor(0,0,0));
 	setPaletteBackgroundColor(TQColor(255,255,255));
@@ -323,7 +323,7 @@ void KviScriptEditorWidget::keyPressEvent(TQKeyEvent * e)
 			case TQt::Key_Return:
 			case TQt::Key_Backspace:
 			case TQt::Key_PageUp:
-				 e->ignore(); // allow the tqparent to process it
+				 e->ignore(); // allow the parent to process it
 				 return;
 			break;
 		}
@@ -1117,10 +1117,10 @@ void KviScriptEditorImplementation::configureColors()
 		saveOptions();
 	}
 }
-KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* tqparent, const char* name)
-    : TQDialog( tqparent)
+KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* parent, const char* name)
+    : TQDialog( parent)
 {
-	m_pParent=tqparent;
+	m_pParent=parent;
 	emit initFind();
 	setPaletteForegroundColor( TQColor( 0, 0, 0 ) );
 	setPaletteBackgroundColor( TQColor( 236, 233, 216 ) );
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 91635726..4802be33 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -47,7 +47,7 @@ class KviCompletionBox: public KviTalListBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviCompletionBox(TQWidget * tqparent);
+	KviCompletionBox(TQWidget * parent);
 	~KviCompletionBox(){};
 	
 	void updateContents(TQString word);
@@ -176,7 +176,7 @@ class KviScriptEditorReplaceDialog: public TQDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviScriptEditorReplaceDialog( TQWidget* tqparent = 0, const char* name = 0);
+	KviScriptEditorReplaceDialog( TQWidget* parent = 0, const char* name = 0);
     ~KviScriptEditorReplaceDialog();
 	TQLineEdit *m_pFindlineedit;
 	TQLineEdit *m_pReplacelineedit;
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index d967bb74..fc7a4d47 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -141,7 +141,7 @@ void KviEventEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int c
 	if(it)
 	{
 		m_pContextPopup->clear();
-		if(it->tqparent())
+		if(it->parent())
 		{
 			TQString tmp;
 			if(!(((KviEventHandlerListViewItem *)it)->m_bEnabled))
@@ -210,7 +210,7 @@ void KviEventEditor::addHandlerForCurrentEvent()
 	KviTalListViewItem * it = m_pListView->selectedItem();
 	if(it)
 	{
-		if(it->tqparent() == 0)
+		if(it->parent() == 0)
 		{
 			TQString buffer = __tr2qs("default");
 			getUniqueHandlerName((KviEventListViewItem *)it,buffer);
@@ -284,7 +284,7 @@ void KviEventEditor::saveLastEditedItem()
 	TQString buffer = m_pNameEditor->text();
 	if(!KviTQString::equalCI(buffer,m_pLastEditedItem->m_szName))
 	{
-		getUniqueHandlerName((KviEventListViewItem *)(m_pLastEditedItem->tqparent()),buffer);
+		getUniqueHandlerName((KviEventListViewItem *)(m_pLastEditedItem->parent()),buffer);
 	}
 
 	m_pLastEditedItem->m_szName = buffer;
@@ -298,7 +298,7 @@ void KviEventEditor::selectionChanged(KviTalListViewItem * it)
 {
 	__range_valid(m_bOneTimeSetupDone);
 	saveLastEditedItem();
-	if(it->tqparent())
+	if(it->parent())
 	{
 		m_pLastEditedItem = (KviEventHandlerListViewItem *)it;
 		m_pNameEditor->setEnabled(true);
@@ -330,14 +330,14 @@ void KviEventEditor::showEvent(TQShowEvent *e)
 
 void KviEventEditor::getExportEventBuffer(TQString &buffer,KviEventHandlerListViewItem * it)
 {
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 
 	TQString szBuf = it->m_szBuffer;
 
 	KviCommandFormatter::blockFromBuffer(szBuf);
 	
 	buffer = "event(";
-	buffer += ((KviEventListViewItem *)(it->tqparent()))->m_szName;
+	buffer += ((KviEventListViewItem *)(it->parent()))->m_szName;
 	buffer += ",";
 	buffer += it->m_szName;
 	buffer += ")\n";
@@ -348,7 +348,7 @@ void KviEventEditor::getExportEventBuffer(TQString &buffer,KviEventHandlerListVi
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviEventListViewItem *)(it->tqparent()))->m_szName;
+		buffer += ((KviEventListViewItem *)(it->parent()))->m_szName;
 		buffer += " ";
 		buffer += it->m_szName;
 	}
@@ -362,7 +362,7 @@ void KviEventEditor::exportCurrentHandler()
 
 	TQString szName = TQDir::homeDirPath();
 	if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
-	szName += ((KviEventListViewItem *)(m_pLastEditedItem->tqparent()))->m_szName;
+	szName += ((KviEventListViewItem *)(m_pLastEditedItem->parent()))->m_szName;
 	szName += ".";
 	szName += m_pLastEditedItem->m_szName;
 	szName += ".kvs";
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 90873c33..e01b3165 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -232,10 +232,10 @@ void KviLinksWindow::endOfLinks()
 			if(l->host.contains('*'))wildServers++;
 			it = insertLink(l);
 			if(!it){
-				output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing tqparent (%s) for %s (%d hops): %s (used /LINKS <tqmask> ?)"),
-					l->tqparent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
+				output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing parent (%s) for %s (%d hops): %s (used /LINKS <mask> ?)"),
+					l->parent.ptr(),l->host.ptr(),l->hops,l->description.ptr());
 				brokenLinks++;
-				KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->tqparent.ptr());
+				KviStr tmp(KviStr::Format,__tr2qs("%s: Parent link %s"),l->description.ptr(),l->parent.ptr());
 				KviStr tmp2(KviStr::Format,"%d",l->hops);
 				if(root)it = new KviTalListViewItem(m_pListView,root,TQString(l->host.ptr()),TQString(tmp2.ptr()),TQString(tmp.ptr()));
 				else {
@@ -243,7 +243,7 @@ void KviLinksWindow::endOfLinks()
 					it = new KviTalListViewItem(m_pListView,TQString(l->host.ptr()),TQString(tmp2.ptr()),TQString(tmp.ptr()));
 				}
 			} else {
-				it = it->tqparent();
+				it = it->parent();
 				if(it)
 				{
 					int links = it->childCount() + 1;
@@ -307,7 +307,7 @@ void KviLinksWindow::endOfLinks()
 KviTalListViewItem * KviLinksWindow::insertLink(KviLink *l)
 {
 	__range_valid(l->hops > 0);
-	KviTalListViewItem * i = getItemByHost(l->tqparent.ptr(),0);
+	KviTalListViewItem * i = getItemByHost(l->parent.ptr(),0);
 	KviTalListViewItem * it = 0;
 	if(!i)return 0;
 	else {
@@ -405,7 +405,7 @@ void KviLinksWindow::processData(KviIrcMessage *msg)
 	KviLink * l = new KviLink;
 
 	l->host = msg->safeParam(1);
-	l->tqparent = msg->safeParam(2);
+	l->parent = msg->safeParam(2);
 
 	const char * tr = msg->safeTrailing();
 
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index d21a6045..d0af9ebb 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -39,7 +39,7 @@ class KviThemedLabel;
 typedef struct _KviLink
 {
 	KviStr host;
-	KviStr tqparent;
+	KviStr parent;
 	int hops;
 	KviStr description;
 } KviLink;
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index bdc40838..97d50355 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -116,13 +116,13 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	l = new TQLabel(__tr2qs_ctx("Contents filter","logview"),m_pSearchTab);
 	tqlayout->addMultiCellWidget(l,5,5,0,1);
 
-	l = new TQLabel(__tr2qs_ctx("Log name tqmask:","logview"),m_pSearchTab);
+	l = new TQLabel(__tr2qs_ctx("Log name mask:","logview"),m_pSearchTab);
 	m_pFileNameMask = new TQLineEdit(m_pSearchTab);
 	connect(m_pFileNameMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
 	tqlayout->addWidget(l,6,0);
 	tqlayout->addWidget(m_pFileNameMask,6,1);
 
-	l = new TQLabel(__tr2qs_ctx("Log contents tqmask:","logview"),m_pSearchTab);
+	l = new TQLabel(__tr2qs_ctx("Log contents mask:","logview"),m_pSearchTab);
 	m_pContentsMask = new TQLineEdit(m_pSearchTab);
 	connect(m_pContentsMask,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(applyFilter()));
 	tqlayout->addWidget(l,7,0);
@@ -340,9 +340,9 @@ void KviLogViewMDIWindow::cacheFileList()
 void KviLogViewMDIWindow::itemSelected(KviTalListViewItem * it)
 {
 	bool bCompressed=0;
-	//A tqparent node
+	//A parent node
 	m_pIrcView->clearBuffer();
-	if(!it || !it->tqparent() || !(((KviLogListViewItem *)it)->m_pFileData) )
+	if(!it || !it->parent() || !(((KviLogListViewItem *)it)->m_pFileData) )
 	{
 		return;
 	}
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 8a2a503f..96546e73 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -93,7 +93,7 @@ protected:
 	TQLineEdit          * m_pFileNameMask;
 	TQLineEdit          * m_pContentsMask;
 
-	// Date/time tqmask
+	// Date/time mask
 	TQCheckBox          * m_pEnableFromFilter;
 	TQCheckBox          * m_pEnableToFilter;
 	TQDateEdit          * m_pFromDateEdit;
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index 0c75fc52..03d5c1a9 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -28,140 +28,140 @@
 #include "kvi_ircmask.h"
 
 	/*
-		@doc: tqmask.match
+		@doc: mask.match
 		@type:
 			function
 		@title:
-			$tqmask.match
+			$mask.match
 		@short:
-			Matches a tqmask agains a wildcarded one
+			Matches a mask agains a wildcarded one
 		@syntax:
-			<boolean> $tqmask.match(<wildcard_tqmask:string>,<fixed_tqmask:string>)
+			<boolean> $mask.match(<wildcard_mask:string>,<fixed_mask:string>)
 		@description:
-			Returns 1 if the <wildcard_tqmask> matches <fixed_tqmask> and 0 otherwise.
-			<wildcard_tqmask> can obviously contain wildcards ('*' and '?').
+			Returns 1 if the <wildcard_mask> matches <fixed_mask> and 0 otherwise.
+			<wildcard_mask> can obviously contain wildcards ('*' and '?').
 		@example:
 			[example]
-			[cmd]if[/cmd]($tqmask.match(*!*@*.linux.it,$0))
-				[cmd]op[/cmd] [fnc]$tqmask.nick[/fnc]($0)
+			[cmd]if[/cmd]($mask.match(*!*@*.linux.it,$0))
+				[cmd]op[/cmd] [fnc]$mask.nick[/fnc]($0)
 			[/example]
 	*/
 
 static bool mask_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 { 
 
-	TQString wildtqmask,fixedtqmask;
+	TQString wildmask,fixedmask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("wildcard tqmask",KVS_PT_STRING,0,wildtqmask)
-		KVSM_PARAMETER("fixed tqmask",KVS_PT_STRING,0,fixedtqmask)
+		KVSM_PARAMETER("wildcard mask",KVS_PT_STRING,0,wildmask)
+		KVSM_PARAMETER("fixed mask",KVS_PT_STRING,0,fixedmask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk1(wildtqmask);
-	KviIrcMask mk2(fixedtqmask);
+	KviIrcMask mk1(wildmask);
+	KviIrcMask mk2(fixedmask);
 	c->returnValue()->setBoolean(mk1.matchesFixed(mk2.nick(),mk2.user(),mk2.host()));
 	return true;
 }
 
 	/*
-		@doc: tqmask.nick
+		@doc: mask.nick
 		@type:
 			function
 		@title:
-			$tqmask.nick
+			$mask.nick
 		@short:
-			Returns the nick part of an IRC tqmask
+			Returns the nick part of an IRC mask
 		@syntax:
-			<string> $tqmask.nick(<tqmask:string>)
+			<string> $mask.nick(<mask:string>)
 		@description:
-			Returns the nickname part of an IRC tqmask.
+			Returns the nickname part of an IRC mask.
 	*/
 
 static bool mask_kvs_fnc_nick(KviKvsModuleFunctionCall * c)
 {
 
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setString(mk.nick());
 	return true;
 }
 
 	/*
-		@doc: tqmask.user
+		@doc: mask.user
 		@type:
 			function
 		@title:
-			$tqmask.user
+			$mask.user
 		@short:
-			Returns the username part of an IRC tqmask
+			Returns the username part of an IRC mask
 		@syntax:
-			<string> $tqmask.user(<tqmask:string>)
+			<string> $mask.user(<mask:string>)
 		@description:
-			Returns the username part of an IRC tqmask.
+			Returns the username part of an IRC mask.
 	*/
 
 static bool mask_kvs_fnc_user(KviKvsModuleFunctionCall * c)
 {
 
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setString(mk.user());
 	return true;
 }
 
 
 	/*
-		@doc: tqmask.host
+		@doc: mask.host
 		@type:
 			function
 		@title:
-			$tqmask.host
+			$mask.host
 		@short:
-			Returns the hostname part of an IRC tqmask
+			Returns the hostname part of an IRC mask
 		@syntax:
-			<string> $tqmask.host(<tqmask:string>)
+			<string> $mask.host(<mask:string>)
 		@description:
-			Returns the hostname part of an IRC tqmask.
+			Returns the hostname part of an IRC mask.
 	*/
 
 static bool mask_kvs_fnc_host(KviKvsModuleFunctionCall * c)
 {
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setString(mk.host());
 	return true;
 }
 
 
 	/*
-		@doc: tqmask.hasnumerichost
+		@doc: mask.hasnumerichost
 		@type:
 			function
 		@title:
-			$tqmask.hasNumericHost
+			$mask.hasNumericHost
 		@short:
-			Checks if a host part of a tqmask is numeric
+			Checks if a host part of a mask is numeric
 		@syntax:
-			<boolean> $tqmask.hasNumericHost(<tqmask: string>)
+			<boolean> $mask.hasNumericHost(<mask: string>)
 		@description:
-			Returns 1 if the hostname part of the tqmask is numeric (e.g : unresolved IPV4 or IPV6 address)
+			Returns 1 if the hostname part of the mask is numeric (e.g : unresolved IPV4 or IPV6 address)
 	*/
 
 
 static bool mask_kvs_fnc_hasnumerichost(KviKvsModuleFunctionCall * c)
 {
-	TQString tqmask;
+	TQString mask;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,tqmask)
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,mask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask mk(tqmask);
+	KviIrcMask mk(mask);
 	c->returnValue()->setBoolean(mk.hasNumericHost());
 	return true;
 }
diff --git a/src/modules/objects/class_buttongroup.cpp b/src/modules/objects/class_buttongroup.cpp
index d0f25543..9f6e26ae 100644
--- a/src/modules/objects/class_buttongroup.cpp
+++ b/src/modules/objects/class_buttongroup.cpp
@@ -47,7 +47,7 @@
 		[class]widget[/class]
 	@description:
 		This widget organizes buttons in a group.
-		It will be usually a tqparent for other child controls.
+		It will be usually a parent for other child controls.
 		You can either use a child tqlayout to manage the tqchildren geometries
 		or use $setColumnLayout function to manage the tqlayout automatically.
 		The class ineriths groupbox.
diff --git a/src/modules/objects/class_dialog.cpp b/src/modules/objects/class_dialog.cpp
index 490aabb8..366cf5f0 100644
--- a/src/modules/objects/class_dialog.cpp
+++ b/src/modules/objects/class_dialog.cpp
@@ -46,10 +46,10 @@
 	@description:
 		Rappresents a dialog object. The class is really
 		similar to the widget class, it has only a couple of minor differences.
-		A dialog is always a top-level widget, but if it has a tqparent, its default
-		location is centered on top of the tqparent. It will also share the tqparent's taskbar entry.
+		A dialog is always a top-level widget, but if it has a parent, its default
+		location is centered on top of the parent. It will also share the parent's taskbar entry.
 		If you call $setModal(1) then the dialog will have non-blocking modal behaviour:
-		it will appear above its tqparent widget and block its input until it's closed.
+		it will appear above its parent widget and block its input until it's closed.
 	@functions:
 */
 
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index aa9c8f88..40fc473b 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -141,7 +141,7 @@ bool KviKvsObject_dockwindow::function_addWidget(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	if(((TQWidget *)(pWidget->object()))->tqparent() != (TQObject *)_pDockWindow)
+	if(((TQWidget *)(pWidget->object()))->parent() != (TQObject *)_pDockWindow)
 	{
 		c->warning(__tr2qs("The added widget is not a child of this dock window"));
 	}
diff --git a/src/modules/objects/class_groupbox.cpp b/src/modules/objects/class_groupbox.cpp
index f741f704..07f73bea 100644
--- a/src/modules/objects/class_groupbox.cpp
+++ b/src/modules/objects/class_groupbox.cpp
@@ -59,7 +59,7 @@ const int align_cod[] = {
 		[class]widget[/class]
 	@description:
 		This widget can be used to display a groupbox.
-		It will be usually a tqparent for other child controls.
+		It will be usually a parent for other child controls.
 		You can either use a child tqlayout to manage the tqchildren geometries
 		or use $setColumnLayout to manage the tqlayout automatically.
 	@functions:
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 1a23aa4c..ce2c5365 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -196,9 +196,9 @@ const int frame_cod[] = {
 		[pre]
 		Plain       - no 3D effect (draws using foreground color)[br]
 		Raised      - makes the label look like it was raised above the
-		tqparent widget[br]
+		parent widget[br]
 		Sunken      - makes the label look like it was "pushed" inside
-		the tqparent widget[br]
+		the parent widget[br]
 		[/pre]
 		!fn: $setImage(<image_id>)
 		Sets the image to be displayed on this label. 
diff --git a/src/modules/objects/class_layout.cpp b/src/modules/objects/class_layout.cpp
index 3cc6a0ef..b2842a8c 100644
--- a/src/modules/objects/class_layout.cpp
+++ b/src/modules/objects/class_layout.cpp
@@ -55,7 +55,7 @@
 		The tqlayout is a tqgeometry management tool for child widgets.
 		You create a tqlayout , give it some widgets to manage and it will tqlayout them
 		automatically.[br]
-		The tqparent of the tqlayout must be the widget for which child widget geometries have to be managed.
+		The parent of the tqlayout must be the widget for which child widget geometries have to be managed.
 		A tqlayout is a grid of NxM cells in which you insert child widgets with [classfnc:tqlayout]$addWidget[/classfnc]().[br]
 		Widgets that must span multiple cells can be added to the tqlayout with [classfnc:tqlayout]$addMultiCellWidget[/classfnc]().[br]
 	@functions:
@@ -80,12 +80,12 @@
 		!fn: $setMargin(<margin:uint>)
 		Sets the dimension of the tqlayout margin : the distance from the border to the outermost child widget edges.
 		!fn: $setResizeMode(<resize_mode:string>)
-		Sets the resize mode of the tqparent widget in relation to this tqlayout.
+		Sets the resize mode of the parent widget in relation to this tqlayout.
 		<mode> can be one of:[br]
 		-Auto: this is the default[br]
-		-Fixed: the tqparent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
-		-Minimum: the minimum size of the tqparent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
-		-FreeResize: the tqparent widget of this tqlayout is not constrained at all[br]
+		-Fixed: the parent widget of this tqlayout is resized to the "tqsizeHint" value and it cannot be resized by the user.[br]
+		-Minimum: the minimum size of the parent widget of this tqlayout is set to tqminimumSize() and it cannot be smaller[br]
+		-FreeResize: the parent widget of this tqlayout is not constrained at all[br]
 */
 
 
@@ -116,7 +116,7 @@ bool KviKvsObject_layout::init(KviKvsRunTimeContext * pContext,KviKvsVariantList
 
 	if(!w)
 	{
-		pContext->warning(__tr2qs("The tqparent of a tqlayout must be a widget!"));
+		pContext->warning(__tr2qs("The parent of a tqlayout must be a widget!"));
 		return false;
 	}
 	setObject(TQT_TQOBJECT(new TQGridLayout(w)));
diff --git a/src/modules/objects/class_lineedit.cpp b/src/modules/objects/class_lineedit.cpp
index 8844d1b7..868ce8f1 100644
--- a/src/modules/objects/class_lineedit.cpp
+++ b/src/modules/objects/class_lineedit.cpp
@@ -128,8 +128,8 @@ static const int mode_cod[] =  {
 		With this property user can drag text in the lineedit.
 		!fn: $setReadOnly(<bReadonly:boolean>)
 		Sets the lineedit to read only mode.
-		!fn: $setInputMask(<tqmask:string>)
-		Sets the validation input tqmask to inputMask.[br]
+		!fn: $setInputMask(<mask:string>)
+		Sets the validation input mask to inputMask.[br]
 		Example:[br]
 		[br]
 		%esempio->$setInputMask( "+99 99 99 99 99;_" );[br]
@@ -137,7 +137,7 @@ static const int mode_cod[] =  {
 		%esempio->Ip Number Mask.[br]
 		%esempio->setInputMask( ">AAAAA-AAAAA-AAAAA-AAAAA-AAAAA;#" );[br]
 		[br]
-		The tqmask format understands these tqmask characters:[br]
+		The mask format understands these mask characters:[br]
 		Character		Meaning[br]
 		A			ASCII alphabetic character required. A-Z, a-z.[br]
 		a			ASCII alphabetic character permitted but not required.[br]
@@ -155,7 +155,7 @@ static const int mode_cod[] =  {
 		!			Switch off case conversion.[br]
 		\			Use \ to escape the special characters listed above to use them as separators.[br]
 		[br]
-		The tqmask consists of a string of tqmask characters and separators, optionally[br]
+		The mask consists of a string of mask characters and separators, optionally[br]
 		followed by a semi-colon and the character used for blanks: the blank characters [br]
 		are always removed from the text after editing. The default blank character is space. [br]
 		!fn: $returnPressedEvent()
@@ -407,7 +407,7 @@ bool KviKvsObject_lineedit::functionSetInputMask(KviKvsObjectFunctionCall *c)
 {
 	TQString szMask;
 	KVSO_PARAMETERS_BEGIN(c)
-		KVSO_PARAMETER("tqmask",KVS_PT_STRING,0,szMask)
+		KVSO_PARAMETER("mask",KVS_PT_STRING,0,szMask)
 	KVSO_PARAMETERS_END(c)
 	if (widget())
 		((TQLineEdit *)widget())->setInputMask(szMask);
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 8dd485ab..1bfe95a7 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -59,7 +59,7 @@
 		will add the items to the listview and simply deleting them will remove them.
 		Allocating a [class]listviewitem[/class] item2 as a child of item1 will insert it to the same listview creating
 		a subtree of items spannig from item1. The subtree can be opened or closed by a simple click either
-		on the tqparent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
+		on the parent item or on the little plus sign on the side of it (when [classfnc:listview]$setRootIsDecorated[/classfnc]
 		is set to $true. The listview can be in Single, Multi, Extended or NoSelection selection mode.
 		In single selection mode there can be only one selected item at a time and the selected item is also
 		the current item (this mode is the default). In Multi and Extended selection mode there can be multiple selected items
@@ -510,10 +510,10 @@ void KviKvsObject_listview::fileDropped(TQString &szFile,KviTalListViewItem *ite
 	callFunction(this,"fileDroppedEvent",0,&params);
 }
 
-KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *tqparent)
+KviKvsMdmListView::KviKvsMdmListView(TQWidget * par,const char * name,KviKvsObject_listview *parent)
 :KviTalListView(par)
 {
-	m_pParentScript=tqparent;
+	m_pParentScript=parent;
 	setAcceptDrops(true);
 	viewport()->setAcceptDrops( TRUE );
 
diff --git a/src/modules/objects/class_listviewitem.cpp b/src/modules/objects/class_listviewitem.cpp
index f3826289..49c448e3 100644
--- a/src/modules/objects/class_listviewitem.cpp
+++ b/src/modules/objects/class_listviewitem.cpp
@@ -46,7 +46,7 @@
 		The listviewitem class implements a list view item.
 		A list view item is a multi-column object capable of displaying itself in a [class]listview[/class].
 		To use this class you must instantiate it with another listviewitem or a [class]listview[/class]
-		as tqparent. The item will be automatically displayed.
+		as parent. The item will be automatically displayed.
 		You can set the text and a pixmap in each column and you can make it checkable
 		with [classfnc:listviewitem]$setCheckable[/classfnc]().
 		A checkable listviewitem will display a small check mark in the first column.
@@ -149,7 +149,7 @@ bool KviKvsObject_listviewitem::init(KviKvsRunTimeContext * pContext,KviKvsVaria
 		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"));
+			pContext->error(__tr2qs("The parent of the listviewitem must be either another listviewitem or a listview"));
 			return false;
 		}
 	}
@@ -335,7 +335,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
 	if(bCheckable)
 	{
 		if(m_pListViewItem->rtti() == 1)return true; // a TQCheckListItem already
-		KviTalListViewItem * pParent = m_pListViewItem->tqparent();
+		KviTalListViewItem * pParent = m_pListViewItem->parent();
 		KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
 		// swap the items, so we don't die now
 		KviTalListViewItem * pThis = m_pListViewItem;
@@ -347,7 +347,7 @@ bool KviKvsObject_listviewitem::function_setCheckable(KviKvsObjectFunctionCall *
 			m_pListViewItem = new KviKvsMdmCheckListViewItem(this,pLV);
 	} else {
 		if(m_pListViewItem->rtti() != 1)return true; // not a TQCheckListItem yet
-		KviTalListViewItem * pParent = m_pListViewItem->tqparent();
+		KviTalListViewItem * pParent = m_pListViewItem->parent();
 		KviTalListView * pLV = (KviTalListView *)m_pListViewItem->listView();
 		// swap the items, so we don't die now
 		KviTalListViewItem * pThis = m_pListViewItem;
diff --git a/src/modules/objects/class_painter.cpp b/src/modules/objects/class_painter.cpp
index a9adda33..826d119f 100644
--- a/src/modules/objects/class_painter.cpp
+++ b/src/modules/objects/class_painter.cpp
@@ -311,14 +311,14 @@
 		[br]
 		privateimpl(%Btn,mousepressevent)[br] 
 		{[br] 
-			if ($$->$tqparent->%nextanim==0) [br] 
+			if ($$->$parent->%nextanim==0) [br] 
 			{[br] 
-				$$->$tqparent->%nextanim=1[br] 
+				$$->$parent->%nextanim=1[br] 
 				$$->$settext(Prev)[br] 
 			} [br] 
 			else[br] 
 			{[br] 
-				$$->$tqparent->%nextanim=0[br] 
+				$$->$parent->%nextanim=0[br] 
 				$$->$settext(Next)[br] 
 			}[br]
 		}[br] 
diff --git a/src/modules/objects/class_toolbar.cpp b/src/modules/objects/class_toolbar.cpp
index 637feff7..2b58acd9 100644
--- a/src/modules/objects/class_toolbar.cpp
+++ b/src/modules/objects/class_toolbar.cpp
@@ -81,7 +81,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 {
 	if (!parentObject())
 	{	
-		pContext->warning(__tr2qs("the toolbar cannot be a tqparent-widget!"));
+		pContext->warning(__tr2qs("the toolbar cannot be a parent-widget!"));
 		return true;
 	}
 	if(parentObject()->inherits("KviKvsObject_mainwindow"))
@@ -90,7 +90,7 @@ bool KviKvsObject_toolbar::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 	}
 	else
 	{
-		pContext->warning(__tr2qs("The tqparent-widget isn't a MainWindow."));
+		pContext->warning(__tr2qs("The parent-widget isn't a MainWindow."));
 	}
 	
 	return true;
diff --git a/src/modules/objects/class_widget.cpp b/src/modules/objects/class_widget.cpp
index 3e6b4b6b..4ff98d6e 100644
--- a/src/modules/objects/class_widget.cpp
+++ b/src/modules/objects/class_widget.cpp
@@ -147,11 +147,11 @@ const int widgettypes_cod[] = {
 		If erase is TRUE, erases the widget before the $paintEvent() call.
 		!fn: $x()
 		Returns the x coordinate of the upper-left corner
-		of this widget relative to the tqparent widget,
+		of this widget relative to the parent widget,
 		or to the desktop if this widget is a toplevel one.
 		!fn: $y()
 		Returns the y coordinate of the uspper-left corner
-		of this widget relative to the tqparent widget,
+		of this widget relative to the parent widget,
 		or to the desktop if this widget is a toplevel one.
 		!fn: $width()
 		Returns the width of this widget in pixels.
@@ -162,7 +162,7 @@ const int widgettypes_cod[] = {
 		x, y, width, height.
 		!fn: $setGeometry(<x_or_array>,[<y>,<width>,<heigth>])
 		Sets the tqgeometry of this widget. <x> and <y> are relative
-		to the tqparent widget or to the desktop (if this widget is
+		to the parent widget or to the desktop (if this widget is
 		a toplevel one). All the parameters are in pixels.
 		!fn: $setMinimumWidth(<value>)
 		Sets the minimum width of this widget to <value>.
@@ -182,7 +182,7 @@ const int widgettypes_cod[] = {
 		value. This value is also used by the [class:tqlayout]tqlayout class[/class].
 		!fn: $move(<x_or_array>[,<y>])
 		Moves this widget to the coordinate <x> and <y> relative to its
-		tqparent widget (or the desktop if this widget is a toplevel one).
+		parent widget (or the desktop if this widget is a toplevel one).
 		This is equivalent to [classfnc]$setGeometry[/classfnc](<x>,<y>,
 		[classfnc]$width[/classfnc](),[classfnc]$height[/classfnc]()).
 		!fn: $resize(<w_or_array>,[height])
@@ -212,10 +212,10 @@ const int widgettypes_cod[] = {
 		See also [classfnc]$show[/classfnc]() and [classfnc]$hide[/classfnc]().
 		!fn: $raise()
 		Moves this widget to the top of the stack of the widgets relative
-		to its tqparent. See also [classfnc]$lower[/classfnc].
+		to its parent. See also [classfnc]$lower[/classfnc].
 		!fn: $lower()
 		Moves this widget to the bottom of the stack of the widgets relative
-		to its tqparent. See also [classfnc]$raise[/classfnc]
+		to its parent. See also [classfnc]$raise[/classfnc]
 		!fn: $hasFocus()
 		Returns '1' if this widget has the keyboard focus.
 		See also [classfnc]$setFocus[/classfnc].
@@ -223,7 +223,7 @@ const int widgettypes_cod[] = {
 		Sets this widget to be the one that receives keyboard events.
 		See also [classfnc]$hasFocus[/classfnc]
 		!fn: $parentWidget()
-		Returns the object id of the tqparent widget, or '0' if this
+		Returns the object id of the parent widget, or '0' if this
 		widget is a toplevel one.
 		!fn: $backgroundColor()
 		Returns the background color of this widget in hexadecimal
@@ -1708,12 +1708,12 @@ bool KviKvsObject_widget::function_setMask(KviKvsObjectFunctionCall *c)
 	}
 	TQPixmap * pm=((KviKvsObject_pixmap *)obj)->getPixmap();
 #ifdef COMPILE_USE_QT4
-	TQBitmap tqmask(pm->tqmask());
+	TQBitmap mask(pm->mask());
 #else
-	TQBitmap tqmask(*pm->tqmask());
+	TQBitmap mask(*pm->mask());
 #endif
-	if (tqmask.isNull()) c->warning(__tr2qs("Null tqmask"));
-	widget()->setMask(tqmask);
+	if (mask.isNull()) c->warning(__tr2qs("Null mask"));
+	widget()->setMask(mask);
 	return true;
 }
 #ifdef COMPILE_USE_QT4
diff --git a/src/modules/objects/class_window.cpp b/src/modules/objects/class_window.cpp
index 732e6f4e..393c296d 100644
--- a/src/modules/objects/class_window.cpp
+++ b/src/modules/objects/class_window.cpp
@@ -87,9 +87,9 @@ void KviKvsScriptWindowWindow::centralWidgetDestroyed()
 		[class]widget[/class]
 	@description:
 		This class rappresents a MDI window in a KVIrc frame.
-		Regardless of the tqparent object passed, the window will be always
+		Regardless of the parent object passed, the window will be always
 		a "physical" child of the frame window: you can't embed a window object
-		inside a widget or another window. The tqparent object will just "own" this
+		inside a widget or another window. The parent object will just "own" this
 		window object and eventually destroy it when it dies.
 		This class can manage only a single central child widget that must
 		be set with $setCentralWidget().
diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp
index 3ea0c13b..13c9bf8f 100644
--- a/src/modules/objects/class_wizard.cpp
+++ b/src/modules/objects/class_wizard.cpp
@@ -340,10 +340,10 @@ void KviKvsObject_wizard::backClicked()
 	KviKvsVariantList *params=0;
 	callFunction(this,"backClickedEvent",params);
 }
-KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_wizard * tqparent)
+KviKvsMdmWizard::KviKvsMdmWizard(TQWidget * par,const char * name,KviKvsObject_wizard * parent)
 :KviTalWizard(par)
 {
-	m_pParentScript=tqparent;
+	m_pParentScript=parent;
 	connect (this->backButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotBackClicked()));
 	connect (this->nextButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextClicked()));
 }
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index b91af107..977c8c9b 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -86,7 +86,7 @@
 #include "class_dockwindow.h"
 #include "class_vbox.h"
 #include "class_hbox.h"
-static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
+static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bWidgetsOnly, KviKvsArray *n, int &idx);
 
 static bool objects_module_cleanup(KviModule *m)
 {
@@ -910,10 +910,10 @@ static bool objects_kvs_fnc_listObjects(KviKvsModuleFunctionCall * cmd)
 	return true;
 }
 
-static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
+static void dumpChildObjects(KviWindow *pWnd, TQObject *parent, const char *spacing, bool bFlag, KviKvsArray *n, int &idx)
 {
 #ifdef COMPILE_USE_QT4
-	const TQObjectList list = tqparent->tqchildren();
+	const TQObjectList list = parent->tqchildren();
 	if( !list.count() ) return;
 	TQString sp(spacing);
 	sp.append(">");
@@ -942,7 +942,7 @@ static void dumpChildObjects(KviWindow *pWnd, TQObject *tqparent, const char *sp
 	}
 
 #else
-	const TQObjectList l = tqparent->childrenListObject();
+	const TQObjectList l = parent->childrenListObject();
 	if( l.isEmpty() ) return;
 	TQObjectListIt it(l);
 	TQString sp(spacing);
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index d86abbba..c0b7bf8a 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -94,7 +94,7 @@ void KviOptionsWidgetContainer::closeEvent(TQCloseEvent *e)
 
 void KviOptionsWidgetContainer::showEvent(TQShowEvent *e)
 {
-	if(tqparent() == 0)
+	if(parent() == 0)
 	{
 		move((g_pApp->desktop()->width() - width()) / 2,
 			(g_pApp->desktop()->height() - height()) / 2);
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 4f53ad13..b00eba60 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -61,8 +61,8 @@ extern KviPointerHashTable<TQString,KviOptionsDialog> * g_pOptionsDialogDict;
 extern KVIRC_API KviApp * g_pApp;
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
-KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText)
-:KviOptionsWidget(tqparent,"general_options_front_widget")
+KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(TQWidget *parent,const TQString &szText)
+:KviOptionsWidget(parent,"general_options_front_widget")
 {
 	createLayout(1,1);
 	TQLabel * l = new TQLabel(szText,this);
@@ -80,8 +80,8 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
 
 
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(tqparent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -89,8 +89,8 @@ KviOptionsListViewItem::KviOptionsListViewItem(KviTalListView *tqparent,KviOptio
 	setPixmap(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
 }
 
-KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e)
-:KviTalListViewItem(tqparent,e->szName)
+KviOptionsListViewItem::KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e)
+:KviTalListViewItem(parent,e->szName)
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
@@ -272,7 +272,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 	fillListView(0,g_pOptionsInstanceManager->instanceEntryTree(),szGroup);
 	
-	if(!tqparent())
+	if(!parent())
 	{
 
 		if(KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y() < 5)
@@ -293,7 +293,7 @@ KviOptionsDialog::KviOptionsDialog(TQWidget * par,const TQString &szGroup)
 
 KviOptionsDialog::~KviOptionsDialog()
 {
-	if(!tqparent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = TQRect(pos().x(),pos().y(),
+	if(!parent())KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry) = TQRect(pos().x(),pos().y(),
 			size().width(),size().height());
 	if(g_pOptionsDialogDict)
 		g_pOptionsDialogDict->remove(m_szGroup);
@@ -378,8 +378,8 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 					font.setUnderline(bOk);
 					pWidget->setFont(font);
 
-					// if there is a TQTabWidget in the tqparent chain, signal it in the tab text
-					TQObject * pParent = pWidget->tqparent();
+					// if there is a TQTabWidget in the parent chain, signal it in the tab text
+					TQObject * pParent = pWidget->parent();
 					while(pParent)
 					{
 						if(pParent->inherits(TQTABWIDGET_OBJECT_NAME_STRING))
@@ -387,13 +387,13 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 							pTabWidgetToMark = (TQTabWidget *)pParent;
 							break;
 						}
-						pParent = pParent->tqparent();
+						pParent = pParent->parent();
 					}
 
 					if(pTabWidgetToMark)
 					{
-						// lookup the KviOptionsWidget tqparent
-						pParent = pWidget->tqparent();
+						// lookup the KviOptionsWidget parent
+						pParent = pWidget->parent();
 						while(pParent)
 						{
 							if(pParent->inherits("KviOptionsWidget"))
@@ -408,7 +408,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 								}
 								break;
 							}
-							pParent = pParent->tqparent();
+							pParent = pParent->parent();
 						}
 					}
 				}
@@ -549,13 +549,13 @@ void KviOptionsDialog::listViewItemSelectionChanged(KviTalListViewItem *it)
 	if(it)
 	{
 		TQString str = it->text(0);
-		KviTalListViewItem * par = it->tqparent();
+		KviTalListViewItem * par = it->parent();
 
 		while(par)
 		{
 			str.prepend(" :: ");
 			str.prepend(par->text(0));
-			par = par->tqparent();
+			par = par->parent();
 		}
 		str.prepend("<b>");
 		str += "</b>";
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 267c5529..1d04b0d4 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -44,15 +44,15 @@ class KviGeneralOptionsFrontWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviGeneralOptionsFrontWidget(TQWidget *tqparent,const TQString &szText);
+	KviGeneralOptionsFrontWidget(TQWidget *parent,const TQString &szText);
 	~KviGeneralOptionsFrontWidget();
 };
 
 class KviOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviOptionsListViewItem(KviTalListView *tqparent,KviOptionsWidgetInstanceEntry * e);
-	KviOptionsListViewItem(KviTalListViewItem *tqparent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsListViewItem(KviTalListView *parent,KviOptionsWidgetInstanceEntry * e);
+	KviOptionsListViewItem(KviTalListViewItem *parent,KviOptionsWidgetInstanceEntry * e);
 	~KviOptionsListViewItem();
 public:
 	KviOptionsWidgetInstanceEntry * m_pInstanceEntry;
diff --git a/src/modules/options/instances.cpp b/src/modules/options/instances.cpp
index c338f4a3..7e1e8968 100644
--- a/src/modules/options/instances.cpp
+++ b/src/modules/options/instances.cpp
@@ -76,409 +76,409 @@
 
 int g_iOptionWidgetInstances = 0;
 
-KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviAntispamOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviAntispamOptionsWidget(tqparent);
+	return new KviAntispamOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviAvatarAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviAvatarAdvancedOptionsWidget(tqparent);
+	return new KviAvatarAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviAwayOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviAwayOptionsWidget(tqparent);
+	return new KviAwayOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviConnectionOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviConnectionOptionsWidget(tqparent);
+	return new KviConnectionOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviConnectionAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviConnectionAdvancedOptionsWidget(tqparent);
+	return new KviConnectionAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviSSLOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviSSLOptionsWidget(tqparent);
+	return new KviSSLOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTransportOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTransportOptionsWidget(tqparent);
+	return new KviTransportOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIdentOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIdentOptionsWidget(tqparent);
+	return new KviIdentOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviCtcpOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviCtcpOptionsWidget(tqparent);
+	return new KviCtcpOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviCtcpFloodProtectionOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviCtcpFloodProtectionOptionsWidget(tqparent);
+	return new KviCtcpFloodProtectionOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccOptionsWidget(tqparent);
+	return new KviDccOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccGeneralOptionsWidget(tqparent);
+	return new KviDccGeneralOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccAdvancedOptionsWidget(tqparent);
+	return new KviDccAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccSendOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccSendOptionsWidget(tqparent);
+	return new KviDccSendOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccSendGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccSendGeneralOptionsWidget(tqparent);
+	return new KviDccSendGeneralOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccSendAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccSendAdvancedOptionsWidget(tqparent);
+	return new KviDccSendAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccChatOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccChatOptionsWidget(tqparent);
+	return new KviDccChatOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviDccVoiceOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviDccVoiceOptionsWidget(tqparent);
+	return new KviDccVoiceOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviGeneralOptOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviGeneralOptOptionsWidget(tqparent);
+	return new KviGeneralOptOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviAlertHighlightingOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviAlertHighlightingOptionsWidget(tqparent);
+	return new KviAlertHighlightingOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviHighlightingOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviHighlightingOptionsWidget(tqparent);
+	return new KviHighlightingOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviAlertOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviAlertOptionsWidget(tqparent);
+	return new KviAlertOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIdentityOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIdentityOptionsWidget(tqparent);
+	return new KviIdentityOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIdentityGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIdentityGeneralOptionsWidget(tqparent);
+	return new KviIdentityGeneralOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIdentityAvatarOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIdentityAvatarOptionsWidget(tqparent);
+	return new KviIdentityAvatarOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIdentityAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIdentityAdvancedOptionsWidget(tqparent);
+	return new KviIdentityAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIgnoreOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIgnoreOptionsWidget(tqparent);
+	return new KviIgnoreOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviInputLookOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviInputLookOptionsWidget(tqparent);
+	return new KviInputLookOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviInputFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviInputFeaturesOptionsWidget(tqparent);
+	return new KviInputFeaturesOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviInterfaceFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviInterfaceFeaturesOptionsWidget(tqparent);
+	return new KviInterfaceFeaturesOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviThemeGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviThemeGeneralOptionsWidget(tqparent);
+	return new KviThemeGeneralOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviThemeTransparencyOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviThemeTransparencyOptionsWidget(tqparent);
+	return new KviThemeTransparencyOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviThemeMdiCaptionsOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviThemeMdiCaptionsOptionsWidget(tqparent);
+	return new KviThemeMdiCaptionsOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviThemeMdiAreaOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviThemeMdiAreaOptionsWidget(tqparent);
+	return new KviThemeMdiAreaOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviThemeToolBarAppletsOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviThemeToolBarAppletsOptionsWidget(tqparent);
+	return new KviThemeToolBarAppletsOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIrcOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIrcOptionsWidget(tqparent);
+	return new KviIrcOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIrcGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIrcGeneralOptionsWidget(tqparent);
+	return new KviIrcGeneralOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIrcAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIrcAdvancedOptionsWidget(tqparent);
+	return new KviIrcAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviChannelOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviChannelOptionsWidget(tqparent);
+	return new KviChannelOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviChannelGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviChannelGeneralOptionsWidget(tqparent);
+	return new KviChannelGeneralOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviChannelAdvancedOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviChannelAdvancedOptionsWidget(tqparent);
+	return new KviChannelAdvancedOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIrcOutputOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIrcOutputOptionsWidget(tqparent);
+	return new KviIrcOutputOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIrcViewThemeOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIrcViewThemeOptionsWidget(tqparent);
+	return new KviIrcViewThemeOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIrcViewLookOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIrcViewLookOptionsWidget(tqparent);
+	return new KviIrcViewLookOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviIrcViewFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviIrcViewFeaturesOptionsWidget(tqparent);
+	return new KviIrcViewFeaturesOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviLagOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviLagOptionsWidget(tqparent);
+	return new KviLagOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviLoggingOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviLoggingOptionsWidget(tqparent);
+	return new KviLoggingOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviMediaTypesOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviMediaTypesOptionsWidget(tqparent);
+	return new KviMediaTypesOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviMessageOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviMessageOptionsWidget(tqparent);
+	return new KviMessageOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviPrivmsgOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviPrivmsgOptionsWidget(tqparent);
+	return new KviPrivmsgOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTimestampOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTimestampOptionsWidget(tqparent);
+	return new KviTimestampOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviMessageColorsOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviMessageColorsOptionsWidget(tqparent);
+	return new KviMessageColorsOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviStandardColorsOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviStandardColorsOptionsWidget(tqparent);
+	return new KviStandardColorsOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviNickServOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviNickServOptionsWidget(tqparent);
+	return new KviNickServOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviNotifyOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviNotifyOptionsWidget(tqparent);
+	return new KviNotifyOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviNotifierOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviNotifierOptionsWidget(tqparent);
+	return new KviNotifierOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviProtectionOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviProtectionOptionsWidget(tqparent);
+	return new KviProtectionOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviProxyOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviProxyOptionsWidget(tqparent);
+	return new KviProxyOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviQueryOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviQueryOptionsWidget(tqparent);
+	return new KviQueryOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviServerOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviServerOptionsWidget(tqparent);
+	return new KviServerOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviSoundOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviSoundOptionsWidget(tqparent);
+	return new KviSoundOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviSoundGeneralOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviSoundGeneralOptionsWidget(tqparent);
+	return new KviSoundGeneralOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviSoundsOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviSoundsOptionsWidget(tqparent);
+	return new KviSoundsOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTaskBarOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTaskBarOptionsWidget(tqparent);
+	return new KviTaskBarOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTreeTaskBarOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTreeTaskBarOptionsWidget(tqparent);
+	return new KviTreeTaskBarOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTreeTaskBarForegroundOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTreeTaskBarForegroundOptionsWidget(tqparent);
+	return new KviTreeTaskBarForegroundOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTreeTaskBarBackgroundOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTreeTaskBarBackgroundOptionsWidget(tqparent);
+	return new KviTreeTaskBarBackgroundOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTreeTaskBarFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTreeTaskBarFeaturesOptionsWidget(tqparent);
+	return new KviTreeTaskBarFeaturesOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviClassicTaskBarOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviClassicTaskBarOptionsWidget(tqparent);
+	return new KviClassicTaskBarOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTextEncodingOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTextEncodingOptionsWidget(tqparent);
+	return new KviTextEncodingOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTextIconsOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTextIconsOptionsWidget(tqparent);
+	return new KviTextIconsOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviToolsOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviToolsOptionsWidget(tqparent);
+	return new KviToolsOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTopicLabelLookOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTopicLabelLookOptionsWidget(tqparent);
+	return new KviTopicLabelLookOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviTrayOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviTrayOptionsWidget(tqparent);
+	return new KviTrayOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviUParserOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviUParserOptionsWidget(tqparent);
+	return new KviUParserOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviUrlHandlersOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviUrlHandlersOptionsWidget(tqparent);
+	return new KviUrlHandlersOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviUserListLookOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviUserListLookOptionsWidget(tqparent);
+	return new KviUserListLookOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviUserListLookBackgroundOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviUserListLookBackgroundOptionsWidget(tqparent);
+	return new KviUserListLookBackgroundOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviUserListLookForegroundOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviUserListLookForegroundOptionsWidget(tqparent);
+	return new KviUserListLookForegroundOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviUserListGridOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviUserListGridOptionsWidget(tqparent);
+	return new KviUserListGridOptionsWidget(parent);
 }
 
-KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(TQWidget * tqparent)
+KviOptionsWidget * classKviUserListFeaturesOptionsWidget_createInstanceProc(TQWidget * parent)
 {
-	return new KviUserListFeaturesOptionsWidget(tqparent);
+	return new KviUserListFeaturesOptionsWidget(parent);
 }
 
 
@@ -3460,10 +3460,10 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->tqparent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
-					delete e->pWidget->tqparent();
+					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
 					debug("Ops...i have deleted the options dialog ?");
@@ -3504,9 +3504,9 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		g_iOptionWidgetInstances++;
 		connect(e->pWidget,TQT_SIGNAL(destroyed()),this,TQT_SLOT(widgetDestroyed()));
 	}
-	if(TQT_BASE_OBJECT(e->pWidget->tqparent()) != TQT_BASE_OBJECT(par))
+	if(TQT_BASE_OBJECT(e->pWidget->parent()) != TQT_BASE_OBJECT(par))
 	{
-		TQWidget * oldPar = (TQWidget *)e->pWidget->tqparent();
+		TQWidget * oldPar = (TQWidget *)e->pWidget->parent();
 		e->pWidget->reparent(par,TQPoint(0,0));
 		delete oldPar;
 	}
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index eeb2d8a0..809fd55d 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -103,12 +103,12 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 	{
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			if(d->tqparent())
+			if(d->parent())
 			{
 				d->reparent(0,TQPoint(0,0),true);
 			}
 		} else {
-			if(TQT_BASE_OBJECT(d->tqparent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
+			if(TQT_BASE_OBJECT(d->parent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
 			{
 				d->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
 			}
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index fd1d7ffe..1a25a14d 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -160,9 +160,9 @@ EOF
 
 for aclass in $CLASS_LIST; do
 	echo -n "KviOptionsWidget * class$aclass" >> $TARGET
-		echo "_createInstanceProc(QWidget * tqparent)" >> $TARGET
+		echo "_createInstanceProc(QWidget * parent)" >> $TARGET
 	echo "{" >> $TARGET
-	echo "	return new $aclass(tqparent);" >> $TARGET
+	echo "	return new $aclass(parent);" >> $TARGET
 	echo "}" >> $TARGET
 	echo "" >> $TARGET
 done
@@ -308,10 +308,10 @@ void KviOptionsInstanceManager::deleteInstanceTree(KviPointerList<KviOptionsWidg
 		{
 			if(e->pWidget)
 			{
-				if(e->pWidget->tqparent()->inherits("KviOptionsWidgetContainer"))
+				if(e->pWidget->parent()->inherits("KviOptionsWidgetContainer"))
 				{
 					disconnect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
-					delete e->pWidget->tqparent();
+					delete e->pWidget->parent();
 					e->pWidget =  0;
 				} else {
 					debug("Ops...i have deleted the options dialog ?");
@@ -352,9 +352,9 @@ KviOptionsWidget * KviOptionsInstanceManager::getInstance(KviOptionsWidgetInstan
 		g_iOptionWidgetInstances++;
 		connect(e->pWidget,SIGNAL(destroyed()),this,SLOT(widgetDestroyed()));
 	}
-	if(e->pWidget->tqparent() != par)
+	if(e->pWidget->parent() != par)
 	{
-		QWidget * oldPar = (QWidget *)e->pWidget->tqparent();
+		QWidget * oldPar = (QWidget *)e->pWidget->parent();
 		e->pWidget->reparent(par,QPoint(0,0));
 		delete oldPar;
 	}
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index b317307b..43cc13e9 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -31,8 +31,8 @@
 
 
 
-KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"antispam_options_widget")
+KviAntispamOptionsWidget::KviAntispamOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"antispam_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_antispam.h b/src/modules/options/optw_antispam.h
index 5e7f9bed..98db48c1 100644
--- a/src/modules/options/optw_antispam.h
+++ b/src/modules/options/optw_antispam.h
@@ -33,7 +33,7 @@ class KviAntispamOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAntispamOptionsWidget(TQWidget * tqparent);
+	KviAntispamOptionsWidget(TQWidget * parent);
 	~KviAntispamOptionsWidget();
 protected:
 	KviBoolSelector * m_b1;
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 58165847..d01e4567 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -30,8 +30,8 @@
 
 #include "kvi_tal_tooltip.h"
 
-KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"avatar_advanced_options_widget")
+KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"avatar_advanced_options_widget")
 {
 	createLayout(4,1);
 	// AVATAR
diff --git a/src/modules/options/optw_avatar.h b/src/modules/options/optw_avatar.h
index 003f8d86..f2f2cb6b 100644
--- a/src/modules/options/optw_avatar.h
+++ b/src/modules/options/optw_avatar.h
@@ -39,7 +39,7 @@ class KviAvatarAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAvatarAdvancedOptionsWidget(TQWidget * tqparent);
+	KviAvatarAdvancedOptionsWidget(TQWidget * parent);
 	~KviAvatarAdvancedOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index 3f67fa24..0faf216e 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"away_options_widget")
+KviAwayOptionsWidget::KviAwayOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"away_options_widget")
 {
 	createLayout(4,1);
 
diff --git a/src/modules/options/optw_away.h b/src/modules/options/optw_away.h
index 53d342b0..f4a04870 100644
--- a/src/modules/options/optw_away.h
+++ b/src/modules/options/optw_away.h
@@ -33,7 +33,7 @@ class KviAwayOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAwayOptionsWidget(TQWidget * tqparent);
+	KviAwayOptionsWidget(TQWidget * parent);
 	~KviAwayOptionsWidget();
 protected: 
 	KviBoolSelector		* m_pEnableAwayNick;
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 3427522d..ecd026f2 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -31,8 +31,8 @@
 #include <tqradiobutton.h>
 
 
-KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"connection_options_widget")
+KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"connection_options_widget")
 {
 
 	createLayout(2,1);
@@ -114,8 +114,8 @@ KviConnectionOptionsWidget::~KviConnectionOptionsWidget()
 
 
 
-KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ssl_options_widget")
+KviSSLOptionsWidget::KviSSLOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ssl_options_widget")
 {
 #ifdef COMPILE_SSL_SUPPORT
 	createLayout(3,1);
@@ -156,8 +156,8 @@ KviSSLOptionsWidget::~KviSSLOptionsWidget()
 
 
 
-KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"transport_options_widget")
+KviTransportOptionsWidget::KviTransportOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"transport_options_widget")
 {
 	createLayout(5,1);
 	KviUIntSelector * u;
@@ -202,8 +202,8 @@ KviTransportOptionsWidget::~KviTransportOptionsWidget()
 
 
 
-KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ident_options_widget")
+KviIdentOptionsWidget::KviIdentOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ident_options_widget")
 {
 	createLayout(6,1);
 
@@ -307,8 +307,8 @@ void KviIdentOptionsWidget::enableIpv4InIpv6(bool)
 
 
 
-KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"connection_advanced_options_widget")
+KviConnectionAdvancedOptionsWidget::KviConnectionAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"connection_advanced_options_widget")
 {
 
 }
diff --git a/src/modules/options/optw_connection.h b/src/modules/options/optw_connection.h
index fd180e42..907f57f6 100644
--- a/src/modules/options/optw_connection.h
+++ b/src/modules/options/optw_connection.h
@@ -33,7 +33,7 @@ class KviConnectionOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviConnectionOptionsWidget(TQWidget * tqparent);
+	KviConnectionOptionsWidget(TQWidget * parent);
 	~KviConnectionOptionsWidget();
 };
 
@@ -48,7 +48,7 @@ class KviConnectionAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviConnectionAdvancedOptionsWidget(TQWidget * tqparent);
+	KviConnectionAdvancedOptionsWidget(TQWidget * parent);
 	~KviConnectionAdvancedOptionsWidget();
 };
 
@@ -65,7 +65,7 @@ class KviSSLOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSSLOptionsWidget(TQWidget * tqparent);
+	KviSSLOptionsWidget(TQWidget * parent);
 	~KviSSLOptionsWidget();
 };
 
@@ -82,7 +82,7 @@ class KviTransportOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTransportOptionsWidget(TQWidget * tqparent);
+	KviTransportOptionsWidget(TQWidget * parent);
 	~KviTransportOptionsWidget();
 };
 
@@ -99,7 +99,7 @@ class KviIdentOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIdentOptionsWidget(TQWidget * tqparent);
+	KviIdentOptionsWidget(TQWidget * parent);
 	~KviIdentOptionsWidget();
 
 	virtual void commit();
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index 72a6d039..c3c7c118 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -30,8 +30,8 @@
 //	#include "kvi_tal_tooltip.h"
 //#endif
 
-KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ctcp_options_widget")
+KviCtcpOptionsWidget::KviCtcpOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ctcp_options_widget")
 {
 
 	createLayout(4,1);
diff --git a/src/modules/options/optw_ctcp.h b/src/modules/options/optw_ctcp.h
index 745f0bb7..7cb1e546 100644
--- a/src/modules/options/optw_ctcp.h
+++ b/src/modules/options/optw_ctcp.h
@@ -34,7 +34,7 @@ class KviCtcpOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviCtcpOptionsWidget(TQWidget * tqparent);
+	KviCtcpOptionsWidget(TQWidget * parent);
 	~KviCtcpOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 9d03daaf..a0604d9b 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -71,8 +71,8 @@
 */
 
 
-KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ctcpfloodprotection_options_widget")
+KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ctcpfloodprotection_options_widget")
 {
 	createLayout(4,2);
 
diff --git a/src/modules/options/optw_ctcpfloodprotection.h b/src/modules/options/optw_ctcpfloodprotection.h
index 0462c432..1d00d32e 100644
--- a/src/modules/options/optw_ctcpfloodprotection.h
+++ b/src/modules/options/optw_ctcpfloodprotection.h
@@ -35,7 +35,7 @@ class KviCtcpFloodProtectionOptionsWidget : public KviOptionsWidget
   TQ_OBJECT
 //	TQ_CLASSINFO("help","ctcpfloodprotectionoptions")
 public:
-	KviCtcpFloodProtectionOptionsWidget(TQWidget * tqparent);
+	KviCtcpFloodProtectionOptionsWidget(TQWidget * parent);
 	~KviCtcpFloodProtectionOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index d6d66e20..8ddf15bc 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -43,8 +43,8 @@ KviDccOptionsWidget::~KviDccOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccgeneral_options_widget")
+KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccgeneral_options_widget")
 {
 	createLayout(2,1);
 
@@ -65,8 +65,8 @@ KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccgeneral_options_widget")
+KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccgeneral_options_widget")
 {
 	createLayout(5,1);
 
@@ -128,7 +128,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(TQWidget * tqparent)
 	mergeTip(b2,__tr2qs_ctx("<center>You can enable this option if you are behind a router that forwards all or a range of ports.<br>" \
 			"KVIrc will try to guess the IP address to use for DCC by looking up the local hostname as seen " \
 			"by the IRC server you're connected to.<br>This method is an exclusive alternative to the \"fixed address\" above.<br>" \
-			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not tqmask hostnames).</center>","options"));
+			"It might guess the correct address automatically if certain conditions are met (e.g. the IRC server does not mask hostnames).</center>","options"));
 #endif
 
 	b = addBoolSelector(g,__tr2qs_ctx("Use \"broken bouncer hack\" to detect address","options"),
@@ -177,8 +177,8 @@ KviDccAdvancedOptionsWidget::~KviDccAdvancedOptionsWidget()
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviDccSendOptionsWidget::KviDccSendOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccsend_options_widget")
+KviDccSendOptionsWidget::KviDccSendOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccsend_options_widget")
 {
 }
 
@@ -188,8 +188,8 @@ KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
 
 
 
-KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccsend_options_widget")
+KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccsend_options_widget")
 {
 	createLayout(5,1);
 
@@ -230,8 +230,8 @@ KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
 }
 
 
-KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccsend_advanced_options_widget")
+KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccsend_advanced_options_widget")
 {
 	createLayout(4,1);
 
@@ -341,8 +341,8 @@ KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
 //}
 
 
-KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"dccchat_options_widget")
+KviDccChatOptionsWidget::KviDccChatOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"dccchat_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_dcc.h b/src/modules/options/optw_dcc.h
index 90587666..1021ef59 100644
--- a/src/modules/options/optw_dcc.h
+++ b/src/modules/options/optw_dcc.h
@@ -34,7 +34,7 @@ class KviDccOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccOptionsWidget(TQWidget * tqparent);
+	KviDccOptionsWidget(TQWidget * parent);
 	~KviDccOptionsWidget();
 };
 
@@ -50,7 +50,7 @@ class KviDccGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccGeneralOptionsWidget(TQWidget * tqparent);
+	KviDccGeneralOptionsWidget(TQWidget * parent);
 	~KviDccGeneralOptionsWidget();
 };
 
@@ -64,7 +64,7 @@ class KviDccAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccAdvancedOptionsWidget(TQWidget * tqparent);
+	KviDccAdvancedOptionsWidget(TQWidget * parent);
 	~KviDccAdvancedOptionsWidget();
 };
 
@@ -82,7 +82,7 @@ class KviDccSendOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccSendOptionsWidget(TQWidget * tqparent);
+	KviDccSendOptionsWidget(TQWidget * parent);
 	~KviDccSendOptionsWidget();
 };
 
@@ -96,7 +96,7 @@ class KviDccSendGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccSendGeneralOptionsWidget(TQWidget * tqparent);
+	KviDccSendGeneralOptionsWidget(TQWidget * parent);
 	~KviDccSendGeneralOptionsWidget();
 };
 
@@ -110,7 +110,7 @@ class KviDccSendAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccSendAdvancedOptionsWidget(TQWidget * tqparent);
+	KviDccSendAdvancedOptionsWidget(TQWidget * parent);
 	~KviDccSendAdvancedOptionsWidget();
 };
 
@@ -125,7 +125,7 @@ class KviDccChatOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviDccChatOptionsWidget(TQWidget * tqparent);
+	KviDccChatOptionsWidget(TQWidget * parent);
 	~KviDccChatOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index c411b735..76ecdf49 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -29,8 +29,8 @@
 #include "kvi_options.h"
 
 
-KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"generalopt_options_widget")
+KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"generalopt_options_widget")
 {
 
 	createLayout(1,4);
diff --git a/src/modules/options/optw_generalopt.h b/src/modules/options/optw_generalopt.h
index 7da3c28a..2a1359a4 100644
--- a/src/modules/options/optw_generalopt.h
+++ b/src/modules/options/optw_generalopt.h
@@ -33,7 +33,7 @@ class KviGeneralOptOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviGeneralOptOptionsWidget(TQWidget * tqparent);
+	KviGeneralOptOptionsWidget(TQWidget * parent);
 	~KviGeneralOptOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index bf12aafa..fdb8e908 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -31,8 +31,8 @@
 
 #include <tqlabel.h>
 
-KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"highlighting_options_widget")
+KviAlertHighlightingOptionsWidget::KviAlertHighlightingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"highlighting_options_widget")
 {
 }
 
@@ -42,8 +42,8 @@ KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
 
 
 
-KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"highlighting_options_widget")
+KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"highlighting_options_widget")
 {
 	createLayout(7,1);
 
@@ -81,8 +81,8 @@ KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
 
 
 
-KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"highlighting_options_widget")
+KviAlertOptionsWidget::KviAlertOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"highlighting_options_widget")
 {
 	createLayout(2,1);
 
diff --git a/src/modules/options/optw_highlighting.h b/src/modules/options/optw_highlighting.h
index 6f03a0db..e14e4e56 100644
--- a/src/modules/options/optw_highlighting.h
+++ b/src/modules/options/optw_highlighting.h
@@ -34,7 +34,7 @@ class KviAlertHighlightingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAlertHighlightingOptionsWidget(TQWidget * tqparent);
+	KviAlertHighlightingOptionsWidget(TQWidget * parent);
 	~KviAlertHighlightingOptionsWidget();
 };
 
@@ -48,7 +48,7 @@ class KviHighlightingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviHighlightingOptionsWidget(TQWidget * tqparent);
+	KviHighlightingOptionsWidget(TQWidget * parent);
 	~KviHighlightingOptionsWidget();
 };
 
@@ -62,7 +62,7 @@ class KviAlertOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviAlertOptionsWidget(TQWidget * tqparent);
+	KviAlertOptionsWidget(TQWidget * parent);
 	~KviAlertOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 0f702ae3..57b67a48 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -290,8 +290,8 @@ void KviAvatarSelectionDialog::closeEvent(TQCloseEvent * e)
 
 
 
-KviIdentityOptionsWidget::KviIdentityOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityOptionsWidget::KviIdentityOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 }
 
@@ -302,8 +302,8 @@ KviIdentityOptionsWidget::~KviIdentityOptionsWidget()
 
 
 
-KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	m_szAltNicknames[0] = KVI_OPTION_STRING(KviOption_stringNickname2);
 	m_szAltNicknames[1] = KVI_OPTION_STRING(KviOption_stringNickname3);
@@ -488,8 +488,8 @@ void KviIdentityGeneralOptionsWidget::commit()
 }
 
 
-KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(4,1);
 	tqlayout()->setMargin(10);
@@ -664,8 +664,8 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 
 
 
-KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	m_pISelector=0;
 	m_pWSelector=0;
diff --git a/src/modules/options/optw_identity.h b/src/modules/options/optw_identity.h
index 5170e4df..70edba14 100644
--- a/src/modules/options/optw_identity.h
+++ b/src/modules/options/optw_identity.h
@@ -114,7 +114,7 @@ class KviIdentityOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIdentityOptionsWidget(TQWidget * tqparent);
+	KviIdentityOptionsWidget(TQWidget * parent);
 	~KviIdentityOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index d164f64f..9d6b56a8 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -30,8 +30,8 @@
 //#warning "Info tips"
 
 
-KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ignore_options_widget")
+KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ignore_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_ignore.h b/src/modules/options/optw_ignore.h
index 92864f33..6969a52e 100644
--- a/src/modules/options/optw_ignore.h
+++ b/src/modules/options/optw_ignore.h
@@ -35,7 +35,7 @@ class KviIgnoreOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIgnoreOptionsWidget(TQWidget * tqparent);
+	KviIgnoreOptionsWidget(TQWidget * parent);
 	~KviIgnoreOptionsWidget();
 public:
 	KviBoolSelector * m_pIgnorePrivmsg;
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index 210980e7..c1ad6e84 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -28,8 +28,8 @@
 
 //#warning "Info tips"
 
-KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewlook_options_widget")
+KviInputLookOptionsWidget::KviInputLookOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewlook_options_widget")
 {
 	createLayout(10,2);
 
@@ -133,8 +133,8 @@ void KviInputLookOptionsWidget::commit()
 
 
 
-KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget")
+KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
 {
 	createLayout(6,1);
 
diff --git a/src/modules/options/optw_input.h b/src/modules/options/optw_input.h
index 0642ee71..47bda954 100644
--- a/src/modules/options/optw_input.h
+++ b/src/modules/options/optw_input.h
@@ -41,7 +41,7 @@ private:
 	TQComboBox* m_pHorizontalAlign;
 	TQComboBox* m_pVerticalAlign;
 public:
-	KviInputLookOptionsWidget(TQWidget * tqparent);
+	KviInputLookOptionsWidget(TQWidget * parent);
 	~KviInputLookOptionsWidget();
 	
 	virtual void commit();
@@ -56,7 +56,7 @@ class KviInputFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviInputFeaturesOptionsWidget(TQWidget * tqparent);
+	KviInputFeaturesOptionsWidget(TQWidget * parent);
 	~KviInputFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index 0eb2766e..780c493f 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -33,8 +33,8 @@
 #include "kvi_app.h"
 #include "kvi_fileutils.h"
 
-KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"interfacefeatures_options_widget")
+KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"interfacefeatures_options_widget")
 {
 	createLayout(8,1);
 
diff --git a/src/modules/options/optw_interfacefeatures.h b/src/modules/options/optw_interfacefeatures.h
index d302ce21..03fdb6df 100644
--- a/src/modules/options/optw_interfacefeatures.h
+++ b/src/modules/options/optw_interfacefeatures.h
@@ -38,7 +38,7 @@ class KviInterfaceFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviInterfaceFeaturesOptionsWidget(TQWidget * tqparent);
+	KviInterfaceFeaturesOptionsWidget(TQWidget * parent);
 	~KviInterfaceFeaturesOptionsWidget();
 protected:
 	TQCheckBox * m_pDisableSplash;
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 5b7dde18..1e2c998f 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -31,8 +31,8 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(4,2);
 
@@ -53,8 +53,8 @@ KviThemeGeneralOptionsWidget::~KviThemeGeneralOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 
@@ -147,8 +147,8 @@ void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bo
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(7,1);
 
@@ -169,8 +169,8 @@ KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(2,1);
 
@@ -187,8 +187,8 @@ KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(9,1);
 	
diff --git a/src/modules/options/optw_interfacelookglobal.h b/src/modules/options/optw_interfacelookglobal.h
index a631dbe8..22651cea 100644
--- a/src/modules/options/optw_interfacelookglobal.h
+++ b/src/modules/options/optw_interfacelookglobal.h
@@ -39,7 +39,7 @@ class KviThemeGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeGeneralOptionsWidget(TQWidget * tqparent);
+	KviThemeGeneralOptionsWidget(TQWidget * parent);
 	~KviThemeGeneralOptionsWidget();
 };
 
@@ -55,7 +55,7 @@ class KviThemeTransparencyOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeTransparencyOptionsWidget(TQWidget * tqparent);
+	KviThemeTransparencyOptionsWidget(TQWidget * parent);
 	~KviThemeTransparencyOptionsWidget();
 protected:
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -82,7 +82,7 @@ class KviThemeMdiCaptionsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeMdiCaptionsOptionsWidget(TQWidget * tqparent);
+	KviThemeMdiCaptionsOptionsWidget(TQWidget * parent);
 	~KviThemeMdiCaptionsOptionsWidget();
 };
 
@@ -96,7 +96,7 @@ class KviThemeMdiAreaOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeMdiAreaOptionsWidget(TQWidget * tqparent);
+	KviThemeMdiAreaOptionsWidget(TQWidget * parent);
 	~KviThemeMdiAreaOptionsWidget();
 };
 
@@ -111,7 +111,7 @@ class KviThemeToolBarAppletsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeToolBarAppletsOptionsWidget(TQWidget * tqparent);
+	KviThemeToolBarAppletsOptionsWidget(TQWidget * parent);
 	~KviThemeToolBarAppletsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 56552a23..f39add08 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -31,8 +31,8 @@
 #include <tqcombobox.h>
 
 
-KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"irc_options_widget")
+KviIrcOptionsWidget::KviIrcOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irc_options_widget")
 {
 }
 
@@ -42,8 +42,8 @@ KviIrcOptionsWidget::~KviIrcOptionsWidget()
 }
 
 
-KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"irc_options_widget")
+KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irc_options_widget")
 {
 	createLayout(3,1);
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize console after successful login","options"),KviOption_boolMinimizeConsoleAfterConnect);
@@ -68,8 +68,8 @@ KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget()
 
 
 
-KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"irc_advanced_options_widget")
+KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irc_advanced_options_widget")
 {
 	createLayout(3,1);
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit);    
@@ -167,20 +167,20 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(TQWidget * pPar
 
 	KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory);
 	
-	addLabel(0,1,0,1,__tr2qs_ctx("Default ban tqmask:","options"));
+	addLabel(0,1,0,1,__tr2qs_ctx("Default ban mask:","options"));
 	
 	m_pBanTypeCombo=new TQComboBox(this);
 	addWidgetToLayout(m_pBanTypeCombo,1,1,4,1);
 	
-	KviIrcMask hosttqmask("[email protected]");
-	KviIrcMask iptqmask("[email protected]");
+	KviIrcMask hostmask("[email protected]");
+	KviIrcMask ipmask("[email protected]");
 	TQString tmp1;
 	TQString tmp2;
 	for(int i=0;i<=26;i++)
 	{
 		
-		hosttqmask.tqmask(tmp1,(KviIrcMask::MaskType)i);
-		iptqmask.tqmask(tmp2,(KviIrcMask::MaskType)i);
+		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
+		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
 		m_pBanTypeCombo->insertItem(TQString("%1 (%2)").tqarg(tmp1).tqarg(tmp2));
 	}
 	m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
diff --git a/src/modules/options/optw_irc.h b/src/modules/options/optw_irc.h
index d64c34ff..37cc2854 100644
--- a/src/modules/options/optw_irc.h
+++ b/src/modules/options/optw_irc.h
@@ -38,7 +38,7 @@ class KviIrcOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcOptionsWidget(TQWidget * tqparent);
+	KviIrcOptionsWidget(TQWidget * parent);
 	~KviIrcOptionsWidget();
 };
 
@@ -52,7 +52,7 @@ class KviIrcGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcGeneralOptionsWidget(TQWidget * tqparent);
+	KviIrcGeneralOptionsWidget(TQWidget * parent);
 	~KviIrcGeneralOptionsWidget();
 };
 
@@ -67,7 +67,7 @@ class KviIrcAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcAdvancedOptionsWidget(TQWidget * tqparent);
+	KviIrcAdvancedOptionsWidget(TQWidget * parent);
 	~KviIrcAdvancedOptionsWidget();
 };
 
@@ -84,7 +84,7 @@ class KviChannelOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviChannelOptionsWidget(TQWidget * tqparent);
+	KviChannelOptionsWidget(TQWidget * parent);
 	~KviChannelOptionsWidget();
 };
 
@@ -98,7 +98,7 @@ class KviChannelGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviChannelGeneralOptionsWidget(TQWidget * tqparent);
+	KviChannelGeneralOptionsWidget(TQWidget * parent);
 	~KviChannelGeneralOptionsWidget();
 };
 
@@ -111,7 +111,7 @@ class KviChannelAdvancedOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviChannelAdvancedOptionsWidget(TQWidget * tqparent);
+	KviChannelAdvancedOptionsWidget(TQWidget * parent);
 	~KviChannelAdvancedOptionsWidget();
 public:
 	virtual void commit();
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 83414f33..6446fe72 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -35,8 +35,8 @@
 	#include "kvi_tal_tooltip.h"
 #endif
 
-KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircoutput_options_widget")
+KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircoutput_options_widget")
 {
 	createLayout(7,2);
 
diff --git a/src/modules/options/optw_ircoutput.h b/src/modules/options/optw_ircoutput.h
index 3c82add2..b48b8d01 100644
--- a/src/modules/options/optw_ircoutput.h
+++ b/src/modules/options/optw_ircoutput.h
@@ -39,7 +39,7 @@ class KviIrcOutputOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcOutputOptionsWidget(TQWidget * tqparent);
+	KviIrcOutputOptionsWidget(TQWidget * parent);
 	~KviIrcOutputOptionsWidget();
 protected:
 	TQComboBox * m_pVerbosityCombo;
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 1c9e4a28..4bb80f59 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -38,8 +38,8 @@ KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewlook_options_widget")
+KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewlook_options_widget")
 {
 	createLayout(6,2);
 
@@ -139,8 +139,8 @@ void KviIrcViewLookOptionsWidget::commit()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"ircviewfeatures_options_widget")
+KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
 {
 	createLayout(14,1);
 
diff --git a/src/modules/options/optw_ircview.h b/src/modules/options/optw_ircview.h
index 0f7fbfa7..f4024878 100644
--- a/src/modules/options/optw_ircview.h
+++ b/src/modules/options/optw_ircview.h
@@ -60,7 +60,7 @@ private:
 	TQComboBox* m_pHorizontalAlign;
 	TQComboBox* m_pVerticalAlign;
 public:
-	KviIrcViewLookOptionsWidget(TQWidget * tqparent);
+	KviIrcViewLookOptionsWidget(TQWidget * parent);
 	~KviIrcViewLookOptionsWidget();
 public:
 	virtual void commit();
@@ -77,7 +77,7 @@ class KviIrcViewFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviIrcViewFeaturesOptionsWidget(TQWidget * tqparent);
+	KviIrcViewFeaturesOptionsWidget(TQWidget * parent);
 	~KviIrcViewFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 89786184..8dce8615 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -32,8 +32,8 @@
 //#warning "Info tips"
 
 
-KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"lag_options_widget")
+KviLagOptionsWidget::KviLagOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"lag_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_lag.h b/src/modules/options/optw_lag.h
index 065c884f..0c8e1b7f 100644
--- a/src/modules/options/optw_lag.h
+++ b/src/modules/options/optw_lag.h
@@ -34,7 +34,7 @@ class KviLagOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviLagOptionsWidget(TQWidget * tqparent);
+	KviLagOptionsWidget(TQWidget * parent);
 	~KviLagOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index 87b998a2..378c1dd1 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"logging_options_widget")
+KviLoggingOptionsWidget::KviLoggingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"logging_options_widget")
 {
 	createLayout(4,1);
 
diff --git a/src/modules/options/optw_logging.h b/src/modules/options/optw_logging.h
index ede7d413..bda99671 100644
--- a/src/modules/options/optw_logging.h
+++ b/src/modules/options/optw_logging.h
@@ -36,7 +36,7 @@ class KviLoggingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviLoggingOptionsWidget(TQWidget * tqparent);
+	KviLoggingOptionsWidget(TQWidget * parent);
 	~KviLoggingOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 0b0d7c5e..b93081e9 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -62,8 +62,8 @@ void KviMediaTypeListViewItem::copyData(KviMediaType * t)
 	setText(2,m_data.szDescription.ptr());	
 }
 
-KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"mediatypes_options_widget")
+KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"mediatypes_options_widget")
 {
 	createLayout(11,3);
 
diff --git a/src/modules/options/optw_mediatypes.h b/src/modules/options/optw_mediatypes.h
index 06de7f7c..04b5bf4a 100644
--- a/src/modules/options/optw_mediatypes.h
+++ b/src/modules/options/optw_mediatypes.h
@@ -54,7 +54,7 @@ class KviMediaTypesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMediaTypesOptionsWidget(TQWidget * tqparent);
+	KviMediaTypesOptionsWidget(TQWidget * parent);
 	~KviMediaTypesOptionsWidget();
 private:
 	KviTalListView   * m_pListView;
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 058afb61..175f119b 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -68,8 +68,8 @@ KviMessageOptionsWidget::~KviMessageOptionsWidget()
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"privmsg_options_widget")
+KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"privmsg_options_widget")
 {
 	createLayout(4,1);
 
@@ -162,8 +162,8 @@ void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"stdcolors")
+KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"stdcolors")
 {
 	createLayout(5,4);
 	
@@ -370,8 +370,8 @@ int KviMessageColorListBoxItem::height(const KviTalListBox *) const
 */
 
 /*
-KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"irccolors","options")
+KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"irccolors","options")
 {
 	createLayout(5,4);
 
@@ -383,8 +383,8 @@ KviIrcColorsOptionsWidget::~KviIrcColorsOptionsWidget()
 }
 */
 
-KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"messages")
+KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"messages")
 {
 	int i;
 
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index e8ecb59a..cc9f26f3 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -61,7 +61,7 @@ class KviPrivmsgOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviPrivmsgOptionsWidget(TQWidget * tqparent);
+	KviPrivmsgOptionsWidget(TQWidget * parent);
 	~KviPrivmsgOptionsWidget();
 };
 
@@ -77,7 +77,7 @@ class KviTimestampOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTimestampOptionsWidget(TQWidget * tqparent);
+	KviTimestampOptionsWidget(TQWidget * parent);
 	~KviTimestampOptionsWidget();
 public:
 	KviBoolSelector * m_pUseTimestampSelector;
@@ -144,7 +144,7 @@ class KviMessageColorsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviMessageColorsOptionsWidget(TQWidget * tqparent);
+	KviMessageColorsOptionsWidget(TQWidget * parent);
 	~KviMessageColorsOptionsWidget();
 public:
 	KviMessageListView         * m_pListView;
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index c4afaca8..19a7683d 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -67,11 +67,11 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 	m_pNickServMaskEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pNickServMaskEdit,
-		html_center_begin + __tr2qs_ctx("This is the tqmask that NickServ must match to be correctly identified as the NickServ service. "  \
+		html_center_begin + __tr2qs_ctx("This is the mask that NickServ must match to be correctly identified as the NickServ service. "  \
 			"This usually will be something like <b>[email protected]</b>.<br>" \
 			"You can use wildcards for this field, but generally it is a security flaw. " \
 			"If you're 100%% sure that NO user on the network can use the nickname \"NickServ\", " \
-			"the tqmask <b>NickServ!*@*</b> may be safe to use in this field.","options") + html_center_end);
+			"the mask <b>NickServ!*@*</b> may be safe to use in this field.","options") + html_center_end);
 #endif
 	gl->addMultiCellWidget(m_pNickServMaskEdit,1,1,1,3);
 	
@@ -96,7 +96,7 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 #ifdef COMPILE_INFO_TIPS
 	KviTalToolTip::add(m_pIdentifyCommandEdit,
 		html_center_begin + __tr2qs_ctx("This is the command that will be executed when NickServ requests authentication " \
-			"for the nickname described in this rule (if the both server and NickServ tqmask are matched). " \
+			"for the nickname described in this rule (if the both server and NickServ mask are matched). " \
 			"This usually will be something like <b>msg NickServ identify &lt;yourpassword&gt;</b>.<br>" \
 			"You can use <b>msg -q</b> if you don't want the password echoed on the screen. " \
 			"Please note that there is no leading slash in this command.","options") + html_center_end);
@@ -108,13 +108,13 @@ KviNickServRuleEditor::KviNickServRuleEditor(TQWidget * par,bool bUseServerMaskF
 
 	if(bUseServerMaskField)
 	{
-		l = new TQLabel(__tr2qs_ctx("Server tqmask","options"),this);
+		l = new TQLabel(__tr2qs_ctx("Server mask","options"),this);
 		gl->addWidget(l,4,0);
 		
 		m_pServerMaskEdit = new TQLineEdit(this);
 #ifdef COMPILE_INFO_TIPS
 		KviTalToolTip::add(m_pServerMaskEdit,
-			html_center_begin + __tr2qs_ctx("This is the tqmask that the current server must match in order " \
+			html_center_begin + __tr2qs_ctx("This is the mask that the current server must match in order " \
 			"for this rule to apply. It can contain * and ? wildcards.<br>Do NOT use simply \"*\" here...","options") + html_center_end);
 #endif
 		gl->addMultiCellWidget(m_pServerMaskEdit,4,4,1,3);
@@ -180,7 +180,7 @@ bool KviNickServRuleEditor::validate()
 	
 	if(s.isEmpty())
 	{
-		TQMessageBox::warning(this,m,__tr2qs_ctx("The NickServ tqmask can't be empty!<br>You must put at least * there.","options"),o);
+		TQMessageBox::warning(this,m,__tr2qs_ctx("The NickServ mask can't be empty!<br>You must put at least * there.","options"),o);
 		return false;
 	}
 
@@ -231,8 +231,8 @@ bool KviNickServRuleEditor::editRule(KviNickServRule * r)
 
 
 
-KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"nickserv_options_widget")
+KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"nickserv_options_widget")
 {
 	createLayout(3,3);
 	
@@ -253,7 +253,7 @@ KviNickServOptionsWidget::KviNickServOptionsWidget(TQWidget * tqparent)
 	m_pNickServListView->setSelectionMode(KviTalListView::Single);
 	m_pNickServListView->setAllColumnsShowFocus(true);
 	m_pNickServListView->addColumn(__tr2qs_ctx("Nickname","options"));
-	m_pNickServListView->addColumn(__tr2qs_ctx("Server tqmask","options"));
+	m_pNickServListView->addColumn(__tr2qs_ctx("Server mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("NickServ Request Mask","options"));
 	m_pNickServListView->addColumn(__tr2qs_ctx("Identify Command","options"));
diff --git a/src/modules/options/optw_nickserv.h b/src/modules/options/optw_nickserv.h
index 9fb6bfc0..81c4a5b2 100644
--- a/src/modules/options/optw_nickserv.h
+++ b/src/modules/options/optw_nickserv.h
@@ -71,7 +71,7 @@ class KviNickServOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviNickServOptionsWidget(TQWidget * tqparent);
+	KviNickServOptionsWidget(TQWidget * parent);
 	~KviNickServOptionsWidget();
 protected:
 	KviTalListView             * m_pNickServListView;
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index c8d3f9b0..8688cdc6 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -31,8 +31,8 @@
 //#warning "Info tips"
 
 
-KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"notify_options_widget")
+KviNotifyOptionsWidget::KviNotifyOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"notify_options_widget")
 {
 	createLayout(5,1);
 
@@ -104,8 +104,8 @@ KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
 
 
 
-KviNotifierOptionsWidget::KviNotifierOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"notifier_options_widget")
+KviNotifierOptionsWidget::KviNotifierOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"notifier_options_widget")
 {
 	createLayout(3,1);
 
diff --git a/src/modules/options/optw_notify.h b/src/modules/options/optw_notify.h
index be771b84..64a42721 100644
--- a/src/modules/options/optw_notify.h
+++ b/src/modules/options/optw_notify.h
@@ -35,7 +35,7 @@ class KviNotifyOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviNotifyOptionsWidget(TQWidget * tqparent);
+	KviNotifyOptionsWidget(TQWidget * parent);
 	~KviNotifyOptionsWidget();
 };
 
@@ -49,7 +49,7 @@ class KviNotifierOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviNotifierOptionsWidget(TQWidget * tqparent);
+	KviNotifierOptionsWidget(TQWidget * parent);
 	~KviNotifierOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index dc8fa0ee..5f125101 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -30,8 +30,8 @@
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-KviProtectionOptionsWidget::KviProtectionOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"protection_options_widget")
+KviProtectionOptionsWidget::KviProtectionOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"protection_options_widget")
 {
 	
 	createLayout(1,1);
diff --git a/src/modules/options/optw_protection.h b/src/modules/options/optw_protection.h
index 1837f591..d00164a7 100644
--- a/src/modules/options/optw_protection.h
+++ b/src/modules/options/optw_protection.h
@@ -42,7 +42,7 @@ class KviProtectionOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviProtectionOptionsWidget(TQWidget * tqparent);
+	KviProtectionOptionsWidget(TQWidget * parent);
 	~KviProtectionOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 98acb0a5..f5db3256 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -41,8 +41,8 @@
 #include <tqtoolbutton.h>
 
 
-KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx)
-: KviTalListViewItem(tqparent,prx->m_szHostname.ptr())
+KviProxyOptionsListViewItem::KviProxyOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,KviProxy * prx)
+: KviTalListViewItem(parent,prx->m_szHostname.ptr())
 {
 	setPixmap(0,pm);
 	m_pProxyData = new KviProxy(*prx);
@@ -53,8 +53,8 @@ KviProxyOptionsListViewItem::~KviProxyOptionsListViewItem()
 	delete m_pProxyData;
 }
 
-KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"proxy_options_widget")
+KviProxyOptionsWidget::KviProxyOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"proxy_options_widget")
 {
 	createLayout(3,2);
 
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index 73b4f78a..53e035c5 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -35,7 +35,7 @@ extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 class KviProxyOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviProxyOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,KviProxy * prx);
+	KviProxyOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,KviProxy * prx);
 	~KviProxyOptionsListViewItem();
 public:
 	KviProxy * m_pProxyData;
@@ -59,7 +59,7 @@ class KviProxyOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviProxyOptionsWidget(TQWidget * tqparent);
+	KviProxyOptionsWidget(TQWidget * parent);
 	~KviProxyOptionsWidget();
 protected:
 	KviTalListView    * m_pListView;
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index a97ce83f..7e60df8a 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -34,8 +34,8 @@
 	#include <kdeversion.h>
 #endif
 
-KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"query_options_widget")
+KviQueryOptionsWidget::KviQueryOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"query_options_widget")
 {
 	createLayout(8,1);
 
diff --git a/src/modules/options/optw_query.h b/src/modules/options/optw_query.h
index 6e6b96ff..5e22ef06 100644
--- a/src/modules/options/optw_query.h
+++ b/src/modules/options/optw_query.h
@@ -36,7 +36,7 @@ class KviQueryOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviQueryOptionsWidget(TQWidget * tqparent);
+	KviQueryOptionsWidget(TQWidget * parent);
 	~KviQueryOptionsWidget();
 protected: 
 };
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 258601f4..319f5be8 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -973,8 +973,8 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 // kvi_app.cpp
 extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
 
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n)
-    : KviTalListViewItem(tqparent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,const KviIrcNetwork *n)
+    : KviTalListViewItem(parent)
 {
 	setPixmap(0,pm);
 	m_pServerData = 0;
@@ -983,8 +983,8 @@ KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListView *tqpar
 	setText(1,n->description());
 }
 
-KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s)
-    : KviTalListViewItem(tqparent)
+KviServerOptionsListViewItem::KviServerOptionsListViewItem(KviTalListViewItem *parent,const TQPixmap &pm,const KviIrcServer *s)
+    : KviTalListViewItem(parent)
 {
 	setPixmap(0,pm);
 	m_pServerData = new KviIrcServer(*s);
@@ -1021,8 +1021,8 @@ void KviServerOptionsListViewItem::updateVisibleStrings()
 
 
 
-KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * tqparent)
-    : KviOptionsWidget(tqparent,"server_options_widget")
+KviServerOptionsWidget::KviServerOptionsWidget(TQWidget * parent)
+    : KviOptionsWidget(parent,"server_options_widget")
 {
 	createLayout(4,2);
 
@@ -1565,7 +1565,7 @@ void KviServerOptionsWidget::newServer()
 		KviServerOptionsListViewItem * net;
 		if(m_pLastEditedItem->m_pServerData)
 		{
-			net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent();
+			net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
 			if(!net)return;
 		}
 		else net = m_pLastEditedItem;
@@ -1607,7 +1607,7 @@ void KviServerOptionsWidget::pasteServer()
 			KviServerOptionsListViewItem * net;
 			if(m_pLastEditedItem->m_pServerData)
 			{
-				net = (KviServerOptionsListViewItem *)m_pLastEditedItem->tqparent();
+				net = (KviServerOptionsListViewItem *)m_pLastEditedItem->parent();
 				if(!net)return;
 			}
 			else net = m_pLastEditedItem;
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index d03f8246..9c14abbb 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -41,8 +41,8 @@ class KviMexServerImport;
 class KviServerOptionsListViewItem : public KviTalListViewItem
 {
 public:
-	KviServerOptionsListViewItem(KviTalListView *tqparent,const TQPixmap &pm,const KviIrcNetwork *n);
-	KviServerOptionsListViewItem(KviTalListViewItem *tqparent,const TQPixmap &pm,const KviIrcServer *s);
+	KviServerOptionsListViewItem(KviTalListView *parent,const TQPixmap &pm,const KviIrcNetwork *n);
+	KviServerOptionsListViewItem(KviTalListViewItem *parent,const TQPixmap &pm,const KviIrcServer *s);
 	~KviServerOptionsListViewItem();
 public:
 	KviIrcServer * m_pServerData;
@@ -158,7 +158,7 @@ class KviServerOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviServerOptionsWidget(TQWidget * tqparent);
+	KviServerOptionsWidget(TQWidget * parent);
 	~KviServerOptionsWidget();
 protected:
 	KviTalListView                    * m_pListView;
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 569d4aee..d2d16598 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -53,8 +53,8 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
 }
 
 
-KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"sound_system_options_widget")
+KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"sound_system_options_widget")
 {
 #ifdef COMPILE_ON_WINDOWS
 	createLayout(4,1);
@@ -283,8 +283,8 @@ void KviSoundGeneralOptionsWidget::commit()
 #endif
 }
 
-KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"sound_options_widget")
+KviSoundsOptionsWidget::KviSoundsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"sound_options_widget")
 {
 	createLayout(5,2);
 	addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options"));
diff --git a/src/modules/options/optw_sound.h b/src/modules/options/optw_sound.h
index 3c2128f3..645b8274 100644
--- a/src/modules/options/optw_sound.h
+++ b/src/modules/options/optw_sound.h
@@ -39,7 +39,7 @@ class KviSoundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSoundOptionsWidget(TQWidget * tqparent);
+	KviSoundOptionsWidget(TQWidget * parent);
 	~KviSoundOptionsWidget();
 };
 
@@ -54,7 +54,7 @@ class KviSoundGeneralOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSoundGeneralOptionsWidget(TQWidget * tqparent);
+	KviSoundGeneralOptionsWidget(TQWidget * parent);
 	~KviSoundGeneralOptionsWidget();
 protected:
 	TQComboBox * m_pSoundSystemBox;
@@ -90,7 +90,7 @@ class KviSoundsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviSoundsOptionsWidget(TQWidget * tqparent);
+	KviSoundsOptionsWidget(TQWidget * parent);
 	~KviSoundsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index dae204e3..201766cd 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -27,8 +27,8 @@
 #include "kvi_options.h"
 
 
-KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"taskbar_options_widget")
+KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"taskbar_options_widget")
 {
 
 	createLayout(7,1);
@@ -60,8 +60,8 @@ KviTaskBarOptionsWidget::~KviTaskBarOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarOptionsWidget::KviTreeTaskBarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 }
 
@@ -72,8 +72,8 @@ KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 	createLayout(3,1);
 	
@@ -102,8 +102,8 @@ KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 	createLayout(4,2);
 	
@@ -204,8 +204,8 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"treetaskbar_options_widget")
+KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
 	createLayout(4,1);
 
@@ -225,8 +225,8 @@ KviTreeTaskBarFeaturesOptionsWidget::~KviTreeTaskBarFeaturesOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"classictaskbar_options_widget")
+KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"classictaskbar_options_widget")
 {
 	createLayout(8,1);
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);
diff --git a/src/modules/options/optw_taskbar.h b/src/modules/options/optw_taskbar.h
index 84a0633d..5f15ff23 100644
--- a/src/modules/options/optw_taskbar.h
+++ b/src/modules/options/optw_taskbar.h
@@ -40,7 +40,7 @@ class KviTaskBarOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTaskBarOptionsWidget(TQWidget * tqparent);
+	KviTaskBarOptionsWidget(TQWidget * parent);
 	~KviTaskBarOptionsWidget();
 };
 
@@ -72,7 +72,7 @@ class KviTreeTaskBarForegroundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTreeTaskBarForegroundOptionsWidget(TQWidget * tqparent);
+	KviTreeTaskBarForegroundOptionsWidget(TQWidget * parent);
 	~KviTreeTaskBarForegroundOptionsWidget();
 };
 
@@ -91,7 +91,7 @@ private:
 	TQComboBox* m_pHorizontalAlign;
 	TQComboBox* m_pVerticalAlign;
 public:
-	KviTreeTaskBarBackgroundOptionsWidget(TQWidget * tqparent);
+	KviTreeTaskBarBackgroundOptionsWidget(TQWidget * parent);
 	~KviTreeTaskBarBackgroundOptionsWidget();
 	
 	virtual void commit();
@@ -108,7 +108,7 @@ class KviTreeTaskBarFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTreeTaskBarFeaturesOptionsWidget(TQWidget * tqparent);
+	KviTreeTaskBarFeaturesOptionsWidget(TQWidget * parent);
 	~KviTreeTaskBarFeaturesOptionsWidget();
 };
 
@@ -124,7 +124,7 @@ class KviClassicTaskBarOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviClassicTaskBarOptionsWidget(TQWidget * tqparent);
+	KviClassicTaskBarOptionsWidget(TQWidget * parent);
 	~KviClassicTaskBarOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index aad9f2f3..495df00a 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -32,8 +32,8 @@
 
 TQString g_szPrevSettedLocale;
 
-KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"textencoding_options_widget")
+KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"textencoding_options_widget")
 {
 	createLayout(5,2);
 
diff --git a/src/modules/options/optw_textencoding.h b/src/modules/options/optw_textencoding.h
index 9b0e1864..5c2836e1 100644
--- a/src/modules/options/optw_textencoding.h
+++ b/src/modules/options/optw_textencoding.h
@@ -38,7 +38,7 @@ class KviTextEncodingOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTextEncodingOptionsWidget(TQWidget * tqparent);
+	KviTextEncodingOptionsWidget(TQWidget * parent);
 	~KviTextEncodingOptionsWidget();
 protected:
 	TQString     m_szLanguage;
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 257689c1..3d6e01bc 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -136,8 +136,8 @@ void KviTextIconTableItem::setContentFromEditor(TQWidget * w)
 	}
 }
 
-KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"texticons_options_widget")
+KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"texticons_options_widget")
 {
 	createLayout(2,2);
 
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index fe4e2f12..48243971 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -90,7 +90,7 @@ class KviTextIconsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTextIconsOptionsWidget(TQWidget * tqparent);
+	KviTextIconsOptionsWidget(TQWidget * parent);
 	~KviTextIconsOptionsWidget();
 protected:
 	KviTalTable     * m_pTable;
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index bbbac049..a1f3cf00 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -30,8 +30,8 @@
 #include "kvi_options.h"
 #include "kvi_locale.h"
 
-KviToolsOptionsWidget::KviToolsOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"tools_options_widget")
+KviToolsOptionsWidget::KviToolsOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"tools_options_widget")
 {
 	
 	createLayout(1,1);
diff --git a/src/modules/options/optw_tools.h b/src/modules/options/optw_tools.h
index c0f9fe40..4d191a73 100644
--- a/src/modules/options/optw_tools.h
+++ b/src/modules/options/optw_tools.h
@@ -40,7 +40,7 @@ class KviToolsOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviToolsOptionsWidget(TQWidget * tqparent);
+	KviToolsOptionsWidget(TQWidget * parent);
 	~KviToolsOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 0e833ec5..df6fd0ba 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -32,8 +32,8 @@
 //#warning "Info tips"
 
 
-KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"tray_options_widget")
+KviTrayOptionsWidget::KviTrayOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"tray_options_widget")
 {
 	createLayout(7,1);
 	
diff --git a/src/modules/options/optw_tray.h b/src/modules/options/optw_tray.h
index 5fc4ba78..4d89c3b5 100644
--- a/src/modules/options/optw_tray.h
+++ b/src/modules/options/optw_tray.h
@@ -35,7 +35,7 @@ class KviTrayOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviTrayOptionsWidget(TQWidget * tqparent);
+	KviTrayOptionsWidget(TQWidget * parent);
 	~KviTrayOptionsWidget();
 protected:
 	KviBoolSelector * m_pEnable;
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp
index 6b05d46a..15fe465c 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/optw_uparser.cpp
@@ -31,8 +31,8 @@
 #include <tqlabel.h>
 
 
-KviUParserOptionsWidget::KviUParserOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"uparser_options_widget")
+KviUParserOptionsWidget::KviUParserOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"uparser_options_widget")
 {
 	createLayout(11,1);
 
diff --git a/src/modules/options/optw_uparser.h b/src/modules/options/optw_uparser.h
index 8b538a76..c8ba5ead 100644
--- a/src/modules/options/optw_uparser.h
+++ b/src/modules/options/optw_uparser.h
@@ -34,7 +34,7 @@ class KviUParserOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUParserOptionsWidget(TQWidget * tqparent);
+	KviUParserOptionsWidget(TQWidget * parent);
 	~KviUParserOptionsWidget();
 };
 
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index 8695406d..6e356770 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -32,8 +32,8 @@
 #include <tqlabel.h>
 
 
-KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"urlhandlers_options_widget")
+KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"urlhandlers_options_widget")
 {
 #ifdef COMPILE_ON_WINDOWS
 	#define START_ROW 1
diff --git a/src/modules/options/optw_urlhandlers.h b/src/modules/options/optw_urlhandlers.h
index 611ed509..f3226198 100644
--- a/src/modules/options/optw_urlhandlers.h
+++ b/src/modules/options/optw_urlhandlers.h
@@ -35,7 +35,7 @@ class KviUrlHandlersOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUrlHandlersOptionsWidget(TQWidget * tqparent);
+	KviUrlHandlersOptionsWidget(TQWidget * parent);
 	~KviUrlHandlersOptionsWidget();
 private:
 	KviStringSelector*   m_pHttpHandler;
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index 90695e2a..9785cf22 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -29,8 +29,8 @@
 
 //#warning "Info tips"
 
-KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"userlistlook_options_widget")
+KviUserListLookOptionsWidget::KviUserListLookOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistlook_options_widget")
 {
 }
 
@@ -43,8 +43,8 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"userlistlook_foreground_options_widget")
+KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
 {
 	createLayout(2,2);
 
@@ -74,8 +74,8 @@ KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget(
 {
 }
 
-KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent)
+KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent)
 {
 	createLayout(5,1);
 	KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid);
@@ -116,8 +116,8 @@ void KviUserListGridOptionsWidget::commit()
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"userlistlook_background_options_widget")
+KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistlook_background_options_widget")
 {
 	createLayout(3,2);
 
@@ -223,8 +223,8 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * tqparent)
-: KviOptionsWidget(tqparent,"userlistfeatures_options_widget")
+KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(TQWidget * parent)
+: KviOptionsWidget(parent,"userlistfeatures_options_widget")
 {
 	createLayout(7,1);
 
diff --git a/src/modules/options/optw_userlist.h b/src/modules/options/optw_userlist.h
index 8c4eaee1..447208e8 100644
--- a/src/modules/options/optw_userlist.h
+++ b/src/modules/options/optw_userlist.h
@@ -37,7 +37,7 @@ class KviUserListLookOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListLookOptionsWidget(TQWidget * tqparent);
+	KviUserListLookOptionsWidget(TQWidget * parent);
 	~KviUserListLookOptionsWidget();
 };
 
@@ -54,7 +54,7 @@ class KviUserListLookBackgroundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListLookBackgroundOptionsWidget(TQWidget * tqparent);
+	KviUserListLookBackgroundOptionsWidget(TQWidget * parent);
 	~KviUserListLookBackgroundOptionsWidget();
 protected:
 	TQComboBox* m_pHorizontalAlign;
@@ -76,7 +76,7 @@ class KviUserListLookForegroundOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListLookForegroundOptionsWidget(TQWidget * tqparent);
+	KviUserListLookForegroundOptionsWidget(TQWidget * parent);
 	~KviUserListLookForegroundOptionsWidget();
 };
 
@@ -93,7 +93,7 @@ class KviUserListGridOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListGridOptionsWidget(TQWidget * tqparent);
+	KviUserListGridOptionsWidget(TQWidget * parent);
 	~KviUserListGridOptionsWidget();
 protected:
 	TQComboBox * m_pGridTypeCombo;
@@ -112,7 +112,7 @@ class KviUserListFeaturesOptionsWidget : public KviOptionsWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviUserListFeaturesOptionsWidget(TQWidget * tqparent);
+	KviUserListFeaturesOptionsWidget(TQWidget * parent);
 	~KviUserListFeaturesOptionsWidget();
 };
 
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 38c5bd57..db3479e2 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -62,8 +62,8 @@ KviPopupListViewItem::KviPopupListViewItem(KviTalListView * pListView,KviPopupLi
 	init();
 }
 
-KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t)
-: KviTalListViewItem(tqparent,after)
+KviPopupListViewItem::KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t)
+: KviTalListViewItem(parent,after)
 {
 	m_type = t;
 	init();
@@ -379,7 +379,7 @@ void KviSinglePopupEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt
 
 	if(it)
 	{
-		parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->tqparent());
+		parentMenu = (KviPopupListViewItem *) (((KviPopupListViewItem *)it)->parent());
 		bIsMenu = ((KviPopupListViewItem *)it)->m_type == KviPopupListViewItem::Menu;
 	}
 
@@ -584,13 +584,13 @@ KviPopupListViewItem * KviSinglePopupEditor::newItem(KviPopupListViewItem * par,
 KviPopupListViewItem * KviSinglePopupEditor::newItemBelow(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
 {
 	if(!it)return newItem(0,0,t);
-	return newItem((KviPopupListViewItem *)it->tqparent(),it,t);
+	return newItem((KviPopupListViewItem *)it->parent(),it,t);
 }
 
 KviPopupListViewItem * KviSinglePopupEditor::newItemAbove(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
 {
 	if(!it)return newItem(0,0,t);
-	return newItem((KviPopupListViewItem *)it->tqparent(),(KviPopupListViewItem *)it->itemAbove(),t);
+	return newItem((KviPopupListViewItem *)it->parent(),(KviPopupListViewItem *)it->itemAbove(),t);
 }
 
 KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem * it,KviPopupListViewItem::Type t)
@@ -607,7 +607,7 @@ KviPopupListViewItem * KviSinglePopupEditor::newItemInside(KviPopupListViewItem
 
 void KviSinglePopupEditor::contextNewPrologue()
 {
-	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findPrologue(it))
 //	{
 		m_pListView->setCurrentItem(newItem(it,it,KviPopupListViewItem::Prologue));
@@ -616,7 +616,7 @@ void KviSinglePopupEditor::contextNewPrologue()
 
 void KviSinglePopupEditor::contextNewEpilogue()
 {
-	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * it = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 //	if(!findEpilogue(it))
 //	{
 		KviPopupListViewItem * after = it ? (KviPopupListViewItem *)it->firstChild() : (KviPopupListViewItem *)m_pListView->firstChild();
@@ -653,14 +653,14 @@ void KviSinglePopupEditor::contextCut()
 void KviSinglePopupEditor::contextPasteBelow()
 {
 	if(!m_pClipboard)return;
-	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 	populateMenu(m_pClipboard,par,m_pLastSelectedItem);
 }
 
 void KviSinglePopupEditor::contextPasteAbove()
 {
 	if(!m_pClipboard)return;
-	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->tqparent() : 0;
+	KviPopupListViewItem * par = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->parent() : 0;
 	KviPopupListViewItem * above = m_pLastSelectedItem ? (KviPopupListViewItem *)m_pLastSelectedItem->itemAbove() : 0;
 	populateMenu(m_pClipboard,par,above);
 
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 5c4ce209..5c214ff9 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -42,7 +42,7 @@ public:
 	enum Type { Item , Menu , Separator , Label , Epilogue , Prologue , ExtMenu };
 public:
 	KviPopupListViewItem(KviTalListView * pListView,KviPopupListViewItem * after,Type t);
-	KviPopupListViewItem(KviPopupListViewItem * tqparent,KviPopupListViewItem * after,Type t);
+	KviPopupListViewItem(KviPopupListViewItem * parent,KviPopupListViewItem * after,Type t);
 public:
 	Type                   m_type;
 	TQString                m_szText;
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 521c994c..b710cb40 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -146,7 +146,7 @@ void KviRawEditor::itemPressed(KviTalListViewItem *it,const TQPoint &pnt,int col
 	m_pContextPopup->clear();
 	if(it)
 	{
-		if(it->tqparent())
+		if(it->parent())
 		{
 			if(!(((KviRawHandlerListViewItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
@@ -245,7 +245,7 @@ void KviRawEditor::addHandlerForCurrentRaw()
 	KviTalListViewItem * it = m_pListView->selectedItem();
 	if(it)
 	{
-		if(it->tqparent() == 0)
+		if(it->parent() == 0)
 		{
 			TQString buffer = __tr2qs("default");
 			getUniqueHandlerName((KviRawListViewItem *)it,buffer);
@@ -318,7 +318,7 @@ void KviRawEditor::saveLastEditedItem()
 	TQString buffer = m_pNameEditor->text();
 	if(!KviTQString::equalCI(buffer,m_pLastEditedItem->m_szName))
 	{
-		getUniqueHandlerName((KviRawListViewItem *)(m_pLastEditedItem->tqparent()),buffer);
+		getUniqueHandlerName((KviRawListViewItem *)(m_pLastEditedItem->parent()),buffer);
 	}
 
 	m_pLastEditedItem->m_szName = buffer;
@@ -332,7 +332,7 @@ void KviRawEditor::selectionChanged(KviTalListViewItem * it)
 {
 	__range_valid(m_bOneTimeSetupDone);
 	saveLastEditedItem();
-	if(it->tqparent())
+	if(it->parent())
 	{
 		m_pLastEditedItem = (KviRawHandlerListViewItem *)it;
 		m_pNameEditor->setEnabled(true);
@@ -355,14 +355,14 @@ void KviRawEditor::showEvent(TQShowEvent *e)
 
 void KviRawEditor::getExportEventBuffer(TQString &buffer,KviRawHandlerListViewItem * it)
 {
-	if(!it->tqparent())return;
+	if(!it->parent())return;
 
 	TQString szBuf = it->m_szBuffer;
 
 	KviCommandFormatter::blockFromBuffer(szBuf);
 	
 	buffer = "event(";
-	buffer += ((KviRawListViewItem *)(it->tqparent()))->m_szName;
+	buffer += ((KviRawListViewItem *)(it->parent()))->m_szName;
 	buffer += ",";
 	buffer += it->m_szName;
 	buffer += ")\n";
@@ -373,7 +373,7 @@ void KviRawEditor::getExportEventBuffer(TQString &buffer,KviRawHandlerListViewIt
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviRawListViewItem *)(it->tqparent()))->m_szName;
+		buffer += ((KviRawListViewItem *)(it->parent()))->m_szName;
 		buffer += " ";
 		buffer += it->m_szName;
 	}
@@ -388,7 +388,7 @@ void KviRawEditor::exportCurrentHandler()
 	TQString szName = TQDir::homeDirPath();
 	if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
 	szName += "raw";
-	szName += ((KviRawListViewItem *)(m_pLastEditedItem->tqparent()))->m_szName;
+	szName += ((KviRawListViewItem *)(m_pLastEditedItem->parent()))->m_szName;
 	szName += ".";
 	szName += m_pLastEditedItem->m_szName;
 	szName += ".kvs";
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index cc00fecd..fe38cf34 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -46,10 +46,10 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 	@short:
 		Registers a channel
 	@syntax:
-		regchan.add <channel:string> [nettqmask:string]
+		regchan.add <channel:string> [netmask:string]
 	@description:
-		Registers the <channel> with the specified [nettqmask].
-		[nettqmask] can be a full network name or a wildcard string
+		Registers the <channel> with the specified [netmask].
+		[netmask] can be a full network name or a wildcard string
 		tht will be matched against network names.
 		For example, if you want to register #kvirc on IRCNet
 		you can use regchan.add #kvirc IRCNet.
@@ -57,7 +57,7 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 		you can use regchan.add #kvirc *[br]
 		Obviously if you register both #kvirc/IRCNet and #kvirc/*
 		then #kvirc/IRCNet will be looked first.
-		If nettqmask is not passed a nettqmask of * is assumed.[br]
+		If netmask is not passed a netmask of * is assumed.[br]
 	@examples:
 		[example]
 			regchan.add #kvirc openprojects
@@ -67,13 +67,13 @@ extern KVIRC_API KviRegisteredChannelDataBase * g_pRegisteredChannelDataBase;
 
 static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
 { 
-	TQString szChan,szNettqmask;
+	TQString szChan,szNetmask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel name",KVS_PT_NONEMPTYSTRING,0,szChan)
-		KVSM_PARAMETER("nettqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNettqmask)
+		KVSM_PARAMETER("netmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNetmask)
 	KVSM_PARAMETERS_END(c)
-	if(szNettqmask.isEmpty())szNettqmask="*";
-	g_pRegisteredChannelDataBase->add(new KviRegisteredChannel(szChan,szNettqmask));
+	if(szNetmask.isEmpty())szNetmask="*";
+	g_pRegisteredChannelDataBase->add(new KviRegisteredChannel(szChan,szNetmask));
 	return true;
 }
 
@@ -91,12 +91,12 @@ static bool regchan_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		regchan.remove [-q|--quiet] [-e|--exactly] <channel:string> <network:string>
 	@description:
 		Unregisters the channel named <channel> that best matches <network>
-		with its nettqmask.[br]
+		with its netmask.[br]
 		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
 		netmasks in the database but is compared directly. This means
-		that <network> must be exactly the nettqmask used to register a channel.
+		that <network> must be exactly the netmask used to register a channel.
 	@examples:
 		[example]
 			regchan.remove #kvirc openprojects
@@ -118,7 +118,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 	{
 		g_pRegisteredChannelDataBase->remove(ch);
 	} else {
-		if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No such channel/nettqmask entry in the database"));
+		if(!c->hasSwitch('q',"quiet"))c->warning(__tr2qs("No such channel/netmask entry in the database"));
 	}
 	return true;
 }
@@ -145,7 +145,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 		!fn: -e|--exactly
 		If -e is specified then <network> is not matched against the
 		netmasks in the database but is compared directly. This means
-		that <network> must be exactly the nettqmask used to register a channel.	
+		that <network> must be exactly the netmask used to register a channel.	
 	@examples:
 		[example]
 			regchan.setproperty #kvirc openprojects autojoin true
@@ -175,7 +175,7 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c)
 			ch->removeProperty(szProperty);
 		}
 	} else {
-		if(!c->hasSwitch('q',"quiet")) c->warning(__tr2qs("No such channel/nettqmask entry in the database"));
+		if(!c->hasSwitch('q',"quiet")) c->warning(__tr2qs("No such channel/netmask entry in the database"));
 	}
 	return true;
 }
@@ -230,11 +230,11 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	@short:
 		Get a list of registered channels
 	@syntax:
-		<array> $regchan.list([<channel_tqmask:string>],[<network_tqmask:string>])
+		<array> $regchan.list([<channel_mask:string>],[<network_mask:string>])
 	@description:
-		Returns an array of the channel@nettqmask entries in the registered 
+		Returns an array of the channel@netmask entries in the registered 
 		channels database.[br]
-		Please note that <network_tqmask> is a wildcard string that will match
+		Please note that <network_mask> is a wildcard string that will match
 		wildcard strings.[br]
 	@examples:
 		[example]
@@ -244,10 +244,10 @@ static bool regchan_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 
 static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 { 
-	TQString szChan,szNettqmask;
+	TQString szChan,szNetmask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel name",KVS_PT_STRING,KVS_PF_OPTIONAL,szChan)
-		KVSM_PARAMETER("nettqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNettqmask)
+		KVSM_PARAMETER("netmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szNetmask)
 	KVSM_PARAMETERS_END(c)
 
 	KviKvsArray* pArray = new KviKvsArray();
@@ -257,7 +257,7 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	int aid=0;
 
 	if(szChan.isEmpty())szChan="*";
-	if(szNettqmask.isEmpty())szNettqmask="*";
+	if(szNetmask.isEmpty())szNetmask="*";
 
 	KviPointerHashTable<const char *,KviRegisteredChannelList> * d = g_pRegisteredChannelDataBase->channelDict();
 	KviPointerHashTableIterator<const char *,KviRegisteredChannelList> it(*d);
@@ -266,9 +266,9 @@ static bool regchan_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	{
 		for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
 		if(KviTQString::matchWildExpressionsCI(ch->name().ptr(),szChan) &&
-			KviTQString::matchWildExpressionsCI(ch->netMask().ptr(),szNettqmask))
+			KviTQString::matchWildExpressionsCI(ch->netMask().ptr(),szNetmask))
 		{
-//		FIXME: WE NEED TO RETURN AN ARRAY OF 2-ELEMENT ARRAYS (chan name, nettqmask)
+//		FIXME: WE NEED TO RETURN AN ARRAY OF 2-ELEMENT ARRAYS (chan name, netmask)
 			pArray->set(aid,new KviKvsVariant(TQString(ch->name()+"@"+ch->netMask())));
 //			pArray->set(aid,new KviKvsVariant(TQString(ch->name()));
 //			pArrayCN->set(0,new KviKvsVariant(TQString(ch->name())));
@@ -363,11 +363,11 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	@short:
 		Checks if a channel is registered
 	@syntax:
-		<boolean> $regchan.find(<channel_name:string>,<nettqmask:string>)
+		<boolean> $regchan.find(<channel_name:string>,<netmask:string>)
 	@description:
-		Returns 1 if the channel identified by <channel_name> and <nettqmask>
+		Returns 1 if the channel identified by <channel_name> and <netmask>
 		is registered and 0 otherwise. This function is similar to $regchan.match
-		but for $regchan.find the second parameter is the exact nettqmask
+		but for $regchan.find the second parameter is the exact netmask
 		of the registered channel entry.
 	@examples:
 		[example]
@@ -380,12 +380,12 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 
 static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c)
 { 
-	TQString szChan,szNettqmask;
+	TQString szChan,szNetmask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
-		KVSM_PARAMETER("nettqmask",KVS_PT_STRING,0,szNettqmask)
+		KVSM_PARAMETER("netmask",KVS_PT_STRING,0,szNetmask)
 	KVSM_PARAMETERS_END(c)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNettqmask);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetmask);
 	c->returnValue()->setBoolean(ch);
 	return true;
 }
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index c6a5f70a..648fdfb3 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -292,7 +292,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 
 	fillList();
 
-	if(!tqparent())
+	if(!parent())
 	{
 		if(KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry).y() < 5)
 		{
@@ -309,10 +309,10 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(TQWidget * par)
 KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
 {
 #ifndef Q_OS_MACX
-	if(!tqparent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = TQRect(pos().x(),pos().y(),
+	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = TQRect(pos().x(),pos().y(),
 			size().width(),size().height());
 #else
-	if(!tqparent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry();
+	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = tqgeometry();
 #endif
 
 	g_pRegisteredUsersDialog = 0;
@@ -724,7 +724,7 @@ void KviRegisteredUsersDialog::exportClicked()
 				for(KviIrcMask * m = ml->first();m;m = ml->next())
 				{
 					TQString fullMask;
-					m->tqmask(fullMask,KviIrcMask::NickUserHost);
+					m->mask(fullMask,KviIrcMask::NickUserHost);
 					if(!f.save(fullMask))goto write_error;
 				}
 			} else {
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 66e89d18..646261a1 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -216,7 +216,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(TQWidget * p,KviIrcMask * m)
 
 	TQGridLayout * g = new TQGridLayout(this,3,2,4,4);
 
-	TQLabel * l = new TQLabel(__tr2qs("Insert a tqmask for this user.<br>It can contain the wildcard characters '*' and '?'."),this);
+	TQLabel * l = new TQLabel(__tr2qs("Insert a mask for this user.<br>It can contain the wildcard characters '*' and '?'."),this);
 	//l->tqsetAlignment(TQt::AlignCenter);
 	g->addMultiCellWidget(l,0,0,0,1);
 
@@ -606,8 +606,8 @@ void KviRegisteredUserEntryDialog::okClicked()
 	idx = 0;
 	while(cnt > 0)
 	{
-		TQString tqmask = m_pMaskListBox->text(idx);
-		KviIrcMask * mk = new KviIrcMask(tqmask);
+		TQString mask = m_pMaskListBox->text(idx);
+		KviIrcMask * mk = new KviIrcMask(mask);
 		g_pLocalRegisteredUserDataBase->removeMask(*mk);
 		g_pLocalRegisteredUserDataBase->addMask(u,mk);
 		cnt--;
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 6b8f7155..d40bfab4 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -68,7 +68,7 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 		The reguser module is the scripting interface to the [doc:registered_users]registered users database[/doc].[br]
 		It provides the following set of commands:[br]
 		[cmd]reguser.add[/cmd]: adds an user entry to the database[br]
-		[cmd]reguser.addtqmask[/cmd]: adds an user's tqmask to the database[br]
+		[cmd]reguser.addmask[/cmd]: adds an user's mask to the database[br]
 		[cmd]reguser.remove[/cmd]: removes an user entry from the database[br]
 		[fnc]$reguser.list[/fnc]: lists the entries[br]
 		[cmd]reguser.setproperty[/cmd]: sets a property associated to an entry[br]
@@ -77,7 +77,7 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 		[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 masks for an entry
+		[fnc]$reguser.mask[/fnc](): returns the registration masks for an entry
 */
 
 /*
@@ -105,7 +105,7 @@ KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc]
 */
 
@@ -115,12 +115,12 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	{
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			if(g_pRegisteredUsersDialog->tqparent())
+			if(g_pRegisteredUsersDialog->parent())
 			{
 				g_pRegisteredUsersDialog->reparent(0,TQPoint(0,0),true);
 			}
 		} else {
-			if(TQT_BASE_OBJECT(g_pRegisteredUsersDialog->tqparent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
+			if(TQT_BASE_OBJECT(g_pRegisteredUsersDialog->parent()) != TQT_BASE_OBJECT(c->window()->frame()->splitter()))
 			{
 				g_pRegisteredUsersDialog->reparent(c->window()->frame()->splitter(),TQPoint(0,0),true);
 			}
@@ -150,19 +150,19 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	@short:
 		Registers an user
 	@syntax:
-		reguser.add [-r] [-f] [-q] [-g=group] <name> [tqmask]
+		reguser.add [-r] [-f] [-q] [-g=group] <name> [mask]
 	@description:
 		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 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]
+		If no [mask] is given the new entry has no registration masks: so it can't be "matched" yet. You have to add
+		at least one mask with [cmd]reguser.addmask[/cmd].
+		If [mask] is given, then it is added to the entry mask list.[br]
 		The <name> parameter may contain any character: even spaces are allowed (obviously you have to
 		use quotes in that case).[br]
 		If the '-r' switch is given , the new entry replaces any previous one with the same <name> (the old entry is removed).[br]
 		If the '-f' switch is given , and there is an existing entry with the same name , no warning is printed
-		and the old entry is treated just like it has been just added (thus the [tqmask] is eventually added to its tqmask list).[br]
+		and the old entry is treated just like it has been just added (thus the [mask] is eventually added to its mask list).[br]
 		The '-q' switch causes the command to run in "quiet" mode and print no warning.[br]
 	@examples:
 		[example]
@@ -172,7 +172,7 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc]
 */
 
@@ -182,7 +182,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
 		KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) 
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) 
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) 
 	KVSM_PARAMETERS_END(c) 
 	if(szName.isEmpty())
 	{
@@ -253,7 +253,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc]
 */
 
@@ -280,51 +280,51 @@ static bool reguser_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 }
 
 /*
-	@doc: reguser.addtqmask
+	@doc: reguser.addmask
 	@type:
 		command
 	@title:
-		reguser.addtqmask
+		reguser.addmask
 	@keyterms:
 		registering users
 	@short:
-		Adds a tqmask to a registered user
+		Adds a mask to a registered user
 	@syntax:
-		reguser.addtqmask [-f] <name> <tqmask>
+		reguser.addmask [-f] <name> <mask>
 	@description:
-		Adds a registration tqmask to the database entry with name <name>.[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
+		Adds a registration mask to the database entry with name <name>.[br]
+		The <mask> has the common [doc:irc_masks]irc mask[/doc] format.[br]
+		The only restriction on the <mask> is that it must be unique inside the
+		regusers database: you can't match two users with the same mask (it would
 		have rather undefined results).[br]
-		If -f is used , KVIrc ensures that the tqmask is unique in the database
+		If -f is used , KVIrc ensures that the mask is unique in the database
 		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"
+		Once at least one mask 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 masks.[br]
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] "Szymon Stefanek"
-			reguser.addtqmask "Szymon Stefanek" Pragma!*@*.it
+			reguser.addmask "Szymon Stefanek" Pragma!*@*.it
 		[/example]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
 
-static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
+static bool reguser_kvs_cmd_addmask(KviKvsModuleCommandCall * c)
 {
 	TQString szName; 
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
 		KVSM_PARAMETER("name",KVS_PT_STRING,0,szName) 
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) 
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) 
 	KVSM_PARAMETERS_END(c) 
 	
 	if(szName.isEmpty())
@@ -335,7 +335,7 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 
 	if(szMask.isEmpty())
 	{
-		c->warning(__tr2qs("No tqmask specified"));
+		c->warning(__tr2qs("No mask specified"));
 		return true;
 	}
 
@@ -357,27 +357,27 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 }
 
 /*
-	@doc: reguser.deltqmask
+	@doc: reguser.delmask
 	@type:
 		command
 	@title:
-		reguser.deltqmask
+		reguser.delmask
 	@keyterms:
 		registering users
 	@short:
-		Removes a tqmask from the regusers database
+		Removes a mask from the regusers database
 	@syntax:
-		reguser.deltqmask <tqmask>
+		reguser.delmask <mask>
 	@description:
-		Removes a tqmask from the regusers database.[br]
+		Removes a mask from the regusers database.[br]
 		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>
+		an <user> parameter: if an <user> entry has the <mask>, removing that <mask>
 		will surely remove it from that <user> entry. (contorsions ?)[br]
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] "Szymon Stefanek"
-			[cmd]reguser.addtqmask[/cmd] "Szymon Stefanek" Pragma!*@*.it
-			reguser.deltqmask Pragma!*@*.it
+			[cmd]reguser.addmask[/cmd] "Szymon Stefanek" Pragma!*@*.it
+			reguser.delmask Pragma!*@*.it
 			[fnc]$reguser.list[/fnc]
 		[/example]
 	@seealso:
@@ -385,22 +385,22 @@ static bool reguser_kvs_cmd_addtqmask(KviKvsModuleCommandCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
 
-static bool reguser_kvs_cmd_deltqmask(KviKvsModuleCommandCall * c)
+static bool reguser_kvs_cmd_delmask(KviKvsModuleCommandCall * c)
 {
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szMask) 
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szMask) 
 	KVSM_PARAMETERS_END(c) 
 	
 	if(szMask.isEmpty())
 	{
-		c->warning(__tr2qs("No tqmask specified"));
+		c->warning(__tr2qs("No mask specified"));
 		return true;
 	}
 
@@ -564,8 +564,8 @@ static bool reguser_kvs_cmd_setIgnoreFlags(KviKvsModuleCommandCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
@@ -619,8 +619,8 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
@@ -685,7 +685,7 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 	TQString szProperty;
 	TQString szValue;
 	KVSM_PARAMETERS_BEGIN(c) 
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,0,szName) 
+		KVSM_PARAMETER("mask",KVS_PT_STRING,0,szName) 
 		KVSM_PARAMETER("property",KVS_PT_STRING,0,szProperty) 
 		KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) 
 	KVSM_PARAMETERS_END(c) 
@@ -722,19 +722,19 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 	@short:
 		Get a list of registered user masks
 	@syntax:
-		$reguser.list([tqmask])
+		$reguser.list([mask])
 	@description:
 		Returns an array of the entries in the registered users database.[br]
-		If <tqmask> is specified, only entries matching the <tqmask>
+		If <mask> is specified, only entries matching the <mask>
 		and the entries with no registration masks are listed.[br]
-		Please note that <tqmask> is a wildcard string that will match
+		Please note that <mask> is a wildcard string that will match
 		wildcard strings... don't get messed with that :D[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
@@ -744,10 +744,10 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
+		KVSM_PARAMETER("user_mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
 	KVSM_PARAMETERS_END(c)
 	
-	KviIrcMask tqmask(szMask);
+	KviIrcMask mask(szMask);
 	KviKvsArray* pArray = new KviKvsArray();
 	int aid=0;
 	
@@ -759,7 +759,7 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	while(KviRegisteredUser * u = it.current())
 	{
 		KviPointerList<KviIrcMask> * ml = u->maskList();
-		if(u->matches(tqmask) || (ml->count() == 0))
+		if(u->matches(mask) || (ml->count() == 0))
 		{
 			pArray->set(aid,new KviKvsVariant(u->name()));
 			aid++;
@@ -781,12 +781,12 @@ static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
 	@short:
 		Lists the registered users
 	@syntax:
-		reguser.showlist [tqmask]
+		reguser.showlist [mask]
 	@description:
 		Lists the entries in the registered users database.[br]
-		If <tqmask> is specified, only entries matching the <tqmask>
+		If <mask> is specified, only entries matching the <mask>
 		and the entries with no registration masks are listed.[br]
-		Please note that <tqmask> is a wildcard string that will match
+		Please note that <mask> is a wildcard string that will match
 		wildcard strings... don't get messed with that :D[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
@@ -801,10 +801,10 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 {
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) 
+		KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) 
 	KVSM_PARAMETERS_END(c) 
 
-	KviIrcMask tqmask(szMask);
+	KviIrcMask mask(szMask);
 	c->window()->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Registered users database dump:"));
 
 	int count = 0;
@@ -814,7 +814,7 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	while(KviRegisteredUser * u = it.current())
 	{
 		KviPointerList<KviIrcMask> * ml = u->maskList();
-		if(u->matches(tqmask) || (ml->count() == 0))
+		if(u->matches(mask) || (ml->count() == 0))
 		{
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs(" User: %c%Q"),KVI_TEXT_BOLD,&(u->name()));
 
@@ -859,16 +859,16 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 	@short:
 		Returns an entry in the registered user database
 	@syntax:
-		$reguser.match(<user_tqmask>)
+		$reguser.match(<user_mask>)
 	@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_masks]irc tqmask[/doc] format but can't contain wildcards.[br]
+		Returns the name of the first entry matching <user_mask> in the registered user database.[br]
+		The <user_mask> has the common [doc:irc_masks]irc mask[/doc] format but can't contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.exactMatch[/fnc]
 */
@@ -878,11 +878,11 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask tqmask(szMask);
-//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(tqmask.nick(),tqmask.user(),tqmask.host());
-	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(tqmask.nick(),tqmask.user(),tqmask.host());
+	KviIrcMask mask(szMask);
+//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
 	if(u) c->returnValue()->setString(u->name());
 	return true;
 }
@@ -896,16 +896,16 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns an entry in the registered user database
 	@syntax:
-		$reguser.exactMatch(<user_tqmask>)
+		$reguser.exactMatch(<user_mask>)
 	@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_masks]wild irc tqmask[/doc] format and can contain wildcards.[br]
+		Returns the name of the registered user database entry that has <user_mask> in its registration mask list.[br]
+		The <user_mask> has the common [doc:irc_masks]wild irc mask[/doc] format and can contain wildcards.[br]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc]
 */
@@ -915,10 +915,10 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
-	KviIrcMask tqmask(szMask);
-	KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserWithMask(tqmask);
+	KviIrcMask mask(szMask);
+	KviRegisteredUser * u = g_pRegisteredUserDataBase->findUserWithMask(mask);
 	if(u) c->returnValue()->setString(u->name());
 	return true;
 }
@@ -932,24 +932,24 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 //	@short:
 //		Returns entries in the registered user database
 //	@syntax:
-//		$reguser.matches(<user_tqmask>)
+//		$reguser.matches(<user_mask>)
 //	@description:
-//		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
+//		Returns a comma separated list of registered user masks that match <user_mask>.[br]
+//		User mask 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]
+//		If no registered mask matches the <user_mask> an empty string is returned.[br]
 //	@seealso:
 //		[module:reguser]reguser module documentation[/module]
 //*/
 
-//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * tqmask,KviStr & buffer)
+//static void search_reguser_list(KviRegisteredUserList * l,KviWindow * w,const char * mask,KviStr & buffer)
 //{
 //	for(KviRegisteredUser * u = l->first();u;u = l->next())
 //	{
-//		if(u->matches(tqmask))
+//		if(u->matches(mask))
 //		{
 //			if(buffer.hasData())buffer.append(',');
-//			buffer.append(u->tqmask());
+//			buffer.append(u->mask());
 //		}
 //	}
 //}
@@ -977,17 +977,17 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 
 
 /*
-	@doc: reguser.tqmask
+	@doc: reguser.mask
 	@type:
 		function
 	@title:
-		$reguser.tqmask
+		$reguser.mask
 	@short:
 		Returns the registration masks for a db entry
 	@syntax:
-		$reguser.tqmask(<name>[,<N>])
+		$reguser.mask(<name>[,<N>])
 	@description:
-		Returns the <N>th registration tqmask for the registered user database record identified
+		Returns the <N>th registration mask for the registered user database record identified
 		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 masks at all) , an empty string is returned.[br]
@@ -995,22 +995,22 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] Pragma
-			[cmd]reguser.addtqmask[/cmd] Pragma Pragma!*@*.it
-			[cmd]echo[/cmd] $reguser.tqmask(Pragma,0)
+			[cmd]reguser.addmask[/cmd] Pragma Pragma!*@*.it
+			[cmd]echo[/cmd] $reguser.mask(Pragma,0)
 		[/example]
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
-		[cmd]reguser.deltqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
+		[cmd]reguser.delmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
 */
 
-static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
+static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
 { 
 	TQString szName; 
 	TQString szN;
@@ -1058,7 +1058,7 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
 	@examples:
 		[example]
 			[cmd]reguser.add[/cmd] Pragma
-			[cmd]reguser.addtqmask[/cmd] Pragma Pragma!*@*.it
+			[cmd]reguser.addmask[/cmd] Pragma Pragma!*@*.it
 			[cmd]reguser.setproperty[/cmd] Pragma isDev 1
 			[cmd]echo[/cmd] $reguser.property(Pragma,isDev)
 		[/example]
@@ -1067,7 +1067,7 @@ static bool reguser_kvs_fnc_tqmask(KviKvsModuleFunctionCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.matchProperty[/fnc]
@@ -1100,19 +1100,19 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns a property of an entry in the registered user database
 	@syntax:
-		$reguser.matchProperty(<user_tqmask>,<property_name>)
+		$reguser.matchProperty(<user_mask>,<property_name>)
 	@description:
 		Returns the value of the property identified by <property_name> and
-		bound to the first entry matched by by <user_tqmask>.[br]
+		bound to the first entry matched by by <user_mask>.[br]
 		If the property is not set, an empty string is returned.[br]
-		If no entry matches <user_tqmask> this function returns an empty string
+		If no entry matches <user_mask> this function returns an empty string
 		and does not print any error.[br]
 		[example]
-			%property = $reguser.matchProperty(<user_tqmask>,<property_name>)
+			%property = $reguser.matchProperty(<user_mask>,<property_name>)
 		[/example]
 		Is actually a shortcut for:[br]
 		[example]
-			%tmp = [fnc]$reguser.match[/fnc](<user_tqmask>)
+			%tmp = [fnc]$reguser.match[/fnc](<user_mask>)
 			if("%tmp" != "")%property = $reguser.property(%tmp,<property_name>)
 		[/example]
 	@seealso:
@@ -1120,7 +1120,7 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 		[doc:registered_users]Registered users database[/doc],
 		[cmd]reguser.add[/cmd],
 		[cmd]reguser.remove[/cmd],
-		[cmd]reguser.addtqmask[/cmd],
+		[cmd]reguser.addmask[/cmd],
 		[fnc]$reguser.list[/fnc],
 		[fnc]$reguser.match[/fnc],
 		[fnc]$reguser.property[/fnc]
@@ -1131,13 +1131,13 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
 	TQString szMask; 
 	TQString szProperty;
 	KVSM_PARAMETERS_BEGIN(c)
-		KVSM_PARAMETER("user_tqmask",KVS_PT_STRING,0,szMask)
+		KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
 		KVSM_PARAMETER("property_name",KVS_PT_STRING,KVS_PF_OPTIONAL,szProperty)
 	KVSM_PARAMETERS_END(c)
 	
-	KviIrcMask tqmask(szMask);
-//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(tqmask.nick(),tqmask.user(),tqmask.host());
-	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(tqmask.nick(),tqmask.user(),tqmask.host());
+	KviIrcMask mask(szMask);
+//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
 	if(u)
 	{
 		TQString tmp;
@@ -1158,10 +1158,10 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
 	@short:
 		Shows a registration wizard dialog
 	@syntax:
-		reguser.wizard [tqmask]
+		reguser.wizard [mask]
 	@description:
 		Allows registering an user with an intuitive and easy to use interface.
-		If [tqmask] is specified , it is used as inital tqmask in the dialog.
+		If [mask] is specified , it is used as inital mask in the dialog.
 	@seealso:
 		[module:reguser]Registered users database interface[/module],
 		[doc:registered_users]Registered users database[/doc],
@@ -1172,7 +1172,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 {
 	TQString szMask;
 	KVSM_PARAMETERS_BEGIN(c) 
-		KVSM_PARAMETER("tqmask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) 
+		KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask) 
 	KVSM_PARAMETERS_END(c) 
 
 	KviRegistrationWizard * w = new KviRegistrationWizard(szMask);
@@ -1188,8 +1188,8 @@ static bool reguser_module_init(KviModule * m)
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"add",reguser_kvs_cmd_add);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"remove",reguser_kvs_cmd_remove);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"addtqmask",reguser_kvs_cmd_addtqmask);
-	KVSM_REGISTER_SIMPLE_COMMAND(m,"deltqmask",reguser_kvs_cmd_deltqmask);
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"addmask",reguser_kvs_cmd_addmask);
+	KVSM_REGISTER_SIMPLE_COMMAND(m,"delmask",reguser_kvs_cmd_delmask);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"edit",reguser_kvs_cmd_edit);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"showlist",reguser_kvs_cmd_showlist);
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"setproperty",reguser_kvs_cmd_setproperty);
@@ -1200,7 +1200,7 @@ static bool reguser_module_init(KviModule * m)
 	KVSM_REGISTER_FUNCTION(m,"match",reguser_kvs_fnc_match);
 	KVSM_REGISTER_FUNCTION(m,"list",reguser_kvs_fnc_list);
 	KVSM_REGISTER_FUNCTION(m,"exactMatch",reguser_kvs_fnc_exactMatch);
-	KVSM_REGISTER_FUNCTION(m,"tqmask",reguser_kvs_fnc_tqmask);
+	KVSM_REGISTER_FUNCTION(m,"mask",reguser_kvs_fnc_mask);
 	KVSM_REGISTER_FUNCTION(m,"property",reguser_kvs_fnc_property);
 	KVSM_REGISTER_FUNCTION(m,"matchProperty",reguser_kvs_fnc_matchProperty);
 	KVSM_REGISTER_FUNCTION(m,"getIgnoreFlags",reguser_kvs_fnc_getIgnoreFlags);
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index 75693b35..e42b3c33 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -57,7 +57,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	
 	m_bModal = bModal;
 
-	KviIrcMask tqmask(startMask ? startMask : "*!*@*");
+	KviIrcMask mask(startMask ? startMask : "*!*@*");
 
 	g_pRegistrationWizardList->append(this);
 
@@ -96,7 +96,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pPage1Layout->addWidget(m_pEditRealName,1,0);
     addPage( m_pPage1,__tr2qs("Step 1: Entry Name"));
 
-	if(tqmask.nick() != "*")m_pEditRealName->setText(tqmask.nick());
+	if(mask.nick() != "*")m_pEditRealName->setText(mask.nick());
 
 	connect(m_pEditRealName,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(realNameChanged(const TQString &)));
 
@@ -109,30 +109,30 @@ 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 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_pLabel2->setText(__tr2qs("<p>A registered user is identified by one or more <b>IRC masks</b>.<br>A mask 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 mask.</p>"));
 
     m_pPage2Layout->addMultiCellWidget(m_pLabel2,0,0,0,4);
 
 	//KviStr szMask;
 
-	//tqmask.tqmask(szMask,11);
+	//mask.mask(szMask,11);
 
 	//KviIrcMask masktempl(szMask.ptr());
 
     m_pNicknameEdit1 = new TQLineEdit(m_pPage2);
     m_pNicknameEdit1->tqsetAlignment(TQt::AlignRight);
-	if(tqmask.nick() != "*")m_pNicknameEdit1->setText(tqmask.nick());
+	if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
 	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());
+	if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
 	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());
+	if(mask.hasHost())m_pHostEdit1->setText(mask.host());
 	connect(m_pHostEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(maskChanged(const TQString &)));
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
@@ -226,7 +226,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
     m_pPage4Layout->addWidget(m_pNotifyNickLabel2,4,0);
 
     m_pNotifyNickEdit1 = new TQLineEdit(m_pPage4);
-	if(tqmask.nick() != "*")m_pNotifyNickEdit1->setText(tqmask.nick());
+	if(mask.nick() != "*")m_pNotifyNickEdit1->setText(mask.nick());
 	connect(m_pNotifyNickEdit1,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(notifyNickChanged(const TQString &)));
     m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1);
 
@@ -415,11 +415,11 @@ void KviRegistrationWizard::maskChanged(const TQString &)
 		return;
 	}
 
-	KviStr tqmask(KviStr::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr());
+	KviStr mask(KviStr::Format,"%s!%s@%s",tmp1.ptr(),tmp2.ptr(),tmp3.ptr());
 
-	//KviIrcMask m(tqmask.ptr());
+	//KviIrcMask m(mask.ptr());
 
-	setNextEnabled(m_pPage2,tqmask!="*!*@*");
+	setNextEnabled(m_pPage2,mask!="*!*@*");
 }
 
 void KviRegistrationWizard::realNameChanged(const TQString &)
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 446879a6..712d1205 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -52,7 +52,7 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 	@short:
 		Adds a file sharedfile
 	@syntax:
-		sharedfile.add [-t=<timeout:integer>] [-n=<visible name>] <filename> [user_tqmask]
+		sharedfile.add [-t=<timeout:integer>] [-n=<visible name>] <filename> [user_mask]
 	@switches:
 		!sw: -t=<timeout> | --timeout=<timeout>
 		Specified the timeout after that the share will be automatically removed
@@ -61,8 +61,8 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 	@description:
 		Adds <filename> to the list of the active shared files.
 		The users will be able to request the file via [cmd]dcc.get[/cmd].
-		If [user_tqmask] is specified , the access to the file is limited
-		to the users that match this tqmask, otherwise the tqmask will
+		If [user_mask] is specified , the access to the file is limited
+		to the users that match this mask, otherwise the mask will
 		be automatically set to '*!*@*'.[br]
 		If the 't' switch is used, the sharedfile will be removed after
 		<timeout> seconds. If the 'n' switch is used, the sharedfile
@@ -79,7 +79,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	TQString szFileName,szUserMask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("filename",KVS_PT_NONEMPTYSTRING,0,szFileName)
-		KVSM_PARAMETER("user_tqmask",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szUserMask)
+		KVSM_PARAMETER("user_mask",KVS_PT_NONEMPTYSTRING,KVS_PF_OPTIONAL,szUserMask)
 	KVSM_PARAMETERS_END(c)
 
 	if(!KviFileUtils::isReadable(szFileName))
@@ -92,7 +92,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	KviIrcMask u(szUserMask);
 	
 	TQString szm;
-	u.tqmask(szm);
+	u.mask(szm);
 
 	kvs_int_t timeout = 0;
 
@@ -138,9 +138,9 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	@short:
 		Removes a shared file
 	@syntax:
-		sharedfile.remove <visible name:string> <user tqmask:string> [filesize:integer]
+		sharedfile.remove <visible name:string> <user mask:string> [filesize:integer]
 	@description:
-		Removes the shared file that matches <visible name> and <user tqmask>.
+		Removes the shared file that matches <visible name> and <user mask>.
 		If [filesize] is specified, then it must be matched by the entry
 		to be removed.
 	@seealso:
@@ -153,12 +153,12 @@ static bool sharedfile_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 	kvs_uint_t uSize;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("visible_name",KVS_PT_NONEMPTYSTRING,0,szVisibleName)
-		KVSM_PARAMETER("user_tqmask",KVS_PT_NONEMPTYSTRING,0,szUserMask)
+		KVSM_PARAMETER("user_mask",KVS_PT_NONEMPTYSTRING,0,szUserMask)
 		KVSM_PARAMETER("filesize",KVS_PT_UINT,KVS_PF_OPTIONAL,uSize)
 	KVSM_PARAMETERS_END(c)
 
 	if(!g_pSharedFilesManager->removeSharedFile(szVisibleName,szUserMask,uSize))
-		c->warning(__tr2qs_ctx("No sharedfile with visible name '%Q' and user tqmask '%Q'","sharedfile"),&szVisibleName,&szUserMask);
+		c->warning(__tr2qs_ctx("No sharedfile with visible name '%Q' and user mask '%Q'","sharedfile"),&szVisibleName,&szUserMask);
 
 	return true;
 }
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 7c40b6e3..157e3757 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -75,7 +75,7 @@ KviSharedFileEditDialog::KviSharedFileEditDialog(TQWidget * par,KviSharedFile *
 	g->addWidget( m_pBrowseButton, 1, 3 );
 	connect(m_pBrowseButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(browse()));
 
-	l = new TQLabel(__tr2qs_ctx("User tqmask:","sharedfileswindow"),this);
+	l = new TQLabel(__tr2qs_ctx("User mask:","sharedfileswindow"),this);
 	g->addWidget(l, 2, 0 );
 
 	m_pUserMaskEdit = new TQLineEdit(this);
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index 04d61567..d2618463 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -141,7 +141,7 @@ void KviTermWidget::konsoleDestroyed()
 void KviTermWidget::autoClose()
 {
 	if(m_bIsStandalone)delete this;
-	else ((KviWindow *)tqparent())->close();
+	else ((KviWindow *)parent())->close();
 }
 
 void KviTermWidget::changeTitle(int i,const TQString& str)
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 7ed10db7..816917a5 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -141,8 +141,8 @@ int KviThemeListBoxItem::height(const KviTalListBox * lb) const
 KviThemeManagementDialog * KviThemeManagementDialog::m_pInstance = 0;
 
 
-KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * tqparent)
-: TQDialog(tqparent,"theme_options_widget")
+KviThemeManagementDialog::KviThemeManagementDialog(TQWidget * parent)
+: TQDialog(parent,"theme_options_widget")
 {
 	setCaption(__tr2qs_ctx("Manage Themes - KVIrc","theme"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_THEME)));
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 97e47344..b7a3c948 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -76,7 +76,7 @@ class KviThemeManagementDialog : public TQDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KviThemeManagementDialog(TQWidget * tqparent);
+	KviThemeManagementDialog(TQWidget * parent);
 	virtual ~KviThemeManagementDialog();
 protected:
 	static KviThemeManagementDialog * m_pInstance;
diff --git a/src/modules/torrent/tc_statusbarapplet.cpp b/src/modules/torrent/tc_statusbarapplet.cpp
index b609e8d4..45b32dba 100644
--- a/src/modules/torrent/tc_statusbarapplet.cpp
+++ b/src/modules/torrent/tc_statusbarapplet.cpp
@@ -4,8 +4,8 @@
 #include "tc_interface.h"
 #include "tc_statusbarapplet.h"
 
-KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *tqparent, KviStatusBarAppletDescriptor *desc)
-	: KviStatusBarApplet(tqparent, desc)
+KviTorrentStatusBarApplet::KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc)
+	: KviStatusBarApplet(parent, desc)
 {
 	TQTimer *timer = new TQTimer(this);
 	connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(update()));
diff --git a/src/modules/torrent/tc_statusbarapplet.h b/src/modules/torrent/tc_statusbarapplet.h
index 63ab3054..9051cf87 100644
--- a/src/modules/torrent/tc_statusbarapplet.h
+++ b/src/modules/torrent/tc_statusbarapplet.h
@@ -13,7 +13,7 @@ class KviTorrentStatusBarApplet : public KviStatusBarApplet
 
 public:
 
-	KviTorrentStatusBarApplet(KviStatusBar *tqparent, KviStatusBarAppletDescriptor *desc);
+	KviTorrentStatusBarApplet(KviStatusBar *parent, KviStatusBarAppletDescriptor *desc);
 	virtual ~KviTorrentStatusBarApplet();
 
 	static void selfRegister(KviStatusBar *bar);
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 9533eacf..4bb76752 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -413,8 +413,8 @@ ConfigDialog::~ConfigDialog()
 
 // ---------------------------- CLASS BANFRAME ------------------------begin //
 
-BanFrame::BanFrame(TQWidget *tqparent, const char *name, bool banEnabled)
-:TQFrame(tqparent,name)
+BanFrame::BanFrame(TQWidget *parent, const char *name, bool banEnabled)
+:TQFrame(parent,name)
 {
 	setFrameStyle(TQFrame::Panel | TQFrame::Raised);
 
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index a0cc1ead..79d8d2a1 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -96,7 +96,7 @@ class BanFrame : public TQFrame
 	Q_OBJECT
   TQ_OBJECT
 public:
-	BanFrame(TQWidget *tqparent=0, const char *name=0, bool banEnable = false);
+	BanFrame(TQWidget *parent=0, const char *name=0, bool banEnable = false);
 	~BanFrame();
 	void saveBans();
 private:
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
commit	9ca32ef31a2566af48c06f258722738df92366af (patch)
tree	c847db3bf1bb88b7863fed0cc60eef6bf641306a /src/modules
parent	72aaee9802d447ee21340b011856b9b355a58f1a (diff)
download	kvirc-9ca32ef31a2566af48c06f258722738df92366af.tar.gz kvirc-9ca32ef31a2566af48c06f258722738df92366af.zip