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

78 files changed, 434 insertions, 434 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index d86abbb..c0b7bf8 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 4f53ad1..b00eba6 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 267c552..1d04b0d 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 c338f4a..7e1e896 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 eeb2d8a..809fd55 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 fd1d7ff..1a25a14 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 b317307..43cc13e 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 5e7f9be..98db48c 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 5816584..d01e456 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 003f8d8..f2f2cb6 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 3f67fa2..0faf216 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 53d342b..f4a0487 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 3427522..ecd026f 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 fd180e4..907f57f 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 72a6d03..c3c7c11 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 745f0bb..7cb1e54 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 9d03daa..a0604d9 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 0462c43..1d00d32 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 d6d66e2..8ddf15b 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 9058766..1021ef5 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 c411b73..76ecdf4 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 7da3c28..2a1359a 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 bf12aaf..fdb8e90 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 6f03a0d..e14e4e5 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 0f702ae..57b67a4 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 5170e4d..70edba1 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 d164f64..9d6b56a 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 92864f3..6969a52 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 210980e..c1ad6e8 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 0642ee7..47bda95 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 0eb2766..780c493 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 d302ce2..03fdb6d 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 5b7dde1..1e2c998 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 a631dbe..22651ce 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 56552a2..f39add0 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("nick!user@machine.host.top");
-	KviIrcMask iptqmask("nick!user@192.168.1.2");
+	KviIrcMask hostmask("nick!user@machine.host.top");
+	KviIrcMask ipmask("nick!user@192.168.1.2");
 	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 d64c34f..37cc285 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 83414f3..6446fe7 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 3c82add..b48b8d0 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 1c9e4a2..4bb80f5 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 0f7fbfa..f402487 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 8978618..8dce861 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 065c884..0c8e1b7 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 87b998a..378c1dd 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 ede7d41..bda9967 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 0b0d7c5..b93081e 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 06de7f7..04b5bf4 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 058afb6..175f119 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 e8ecb59..cc9f26f 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 c4afaca..19a7683 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>NickServ!service@services.dalnet</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 9fb6bfc..81c4a5b 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 c8d3f9b..8688cdc 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 be771b8..64a4272 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 dc8fa0e..5f12510 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 1837f59..d00164a 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 98acb0a..f5db325 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 73b4f78..53e035c 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 a97ce83..7e60df8 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 6e6b96f..5e22ef0 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 258601f..319f5be 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 d03f824..9c14abb 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 569d4ae..d2d1659 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 3c2128f..645b827 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 dae204e..201766c 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 84a0633..5f15ff2 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 aad9f2f..495df00 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 9b0e186..5c2836e 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 257689c..3d6e01b 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 fe4e2f1..4824397 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 bbbac04..a1f3cf0 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 c0f9fe4..4d191a7 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 0e833ec..df6fd0b 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 5fc4ba7..4d89c3b 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 6b05d46..15fe465 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 8b538a7..c8ba5ea 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 8695406..6e35677 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 611ed50..f322619 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 90695e2..9785cf2 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 8c4eaee..447208e 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();
 };