From 72aaee9802d447ee21340b011856b9b355a58f1a Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Aug 2011 06:08:18 +0000
Subject: rename the following methods: tqfind find tqreplace replace
 tqcontains contains

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/modules/action/libkviaction.cpp                |  26 ++---
 src/modules/actioneditor/actioneditor.cpp          |  10 +-
 src/modules/addon/libkviaddon.cpp                  |  28 ++---
 src/modules/addon/managementdialog.cpp             |   2 +-
 src/modules/aliaseditor/aliaseditor.cpp            |  22 ++--
 src/modules/avatar/libkviavatar.cpp                |  26 ++---
 src/modules/chan/libkvichan.cpp                    |  16 +--
 src/modules/config/libkviconfig.cpp                |  34 +++---
 src/modules/dcc/broker.cpp                         |   4 +-
 src/modules/dcc/canvaswidget.cpp                   |  10 +-
 src/modules/dcc/descriptor.cpp                     |   6 +-
 src/modules/dcc/descriptor.h                       |   2 +-
 src/modules/dcc/libkvidcc.cpp                      |  90 ++++++++--------
 src/modules/dcc/requests.cpp                       |  34 +++---
 src/modules/dcc/send.cpp                           |   2 +-
 src/modules/dialog/libkvidialog.cpp                |   6 +-
 src/modules/dockwidget/libkvidockwidget_qt3.cpp    |  16 +--
 src/modules/dockwidget/libkvidockwidget_qt4.cpp    |  16 +--
 src/modules/editor/scripteditor.cpp                |  32 +++---
 src/modules/editor/scripteditor.h                  |   6 +-
 src/modules/file/libkvifile.cpp                    |  62 +++++------
 .../filetransferwindow/filetransferwindow.cpp      |  12 +--
 .../libkvifiletransferwindow.cpp                   |   8 +-
 src/modules/help/helpwindow.cpp                    |  28 ++---
 src/modules/help/index.cpp                         |  18 ++--
 src/modules/help/libkvihelp.cpp                    |   4 +-
 src/modules/http/libkvihttp.cpp                    |  22 ++--
 src/modules/links/linkswindow.cpp                  |   2 +-
 src/modules/logview/libkvilogview.cpp              |   8 +-
 src/modules/mediaplayer/libkvimediaplayer.cpp      |   2 +-
 src/modules/mircimport/libkvimircimport.cpp        |   6 +-
 src/modules/notifier/notifierwindow.cpp            |  42 ++++----
 src/modules/notifier/notifierwindowtabs.cpp        |  30 +++---
 src/modules/objects/class_dockwindow.cpp           |  48 ++++-----
 src/modules/objects/class_label.cpp                |   2 +-
 src/modules/objects/class_socket.cpp               |   2 +-
 src/modules/objects/class_wrapper.cpp              |   2 +-
 src/modules/objects/libkviobjects.cpp              |   8 +-
 src/modules/options/dialog.cpp                     |  10 +-
 src/modules/options/libkvioptions.cpp              |   4 +-
 src/modules/options/optw_identity.cpp              |  10 +-
 src/modules/options/optw_nickserv.cpp              |   2 +-
 src/modules/options/optw_servers.cpp               |   6 +-
 src/modules/options/optw_textencoding.cpp          |   4 +-
 src/modules/options/optw_urlhandlers.cpp           |  48 ++++-----
 src/modules/perl/libkviperl.cpp                    |  16 +--
 src/modules/perlcore/KVIrc.xs                      |   4 +-
 src/modules/perlcore/libkviperlcore.cpp            |   6 +-
 src/modules/perlcore/ppport.h                      |   6 +-
 src/modules/perlcore/xs.inc                        |   4 +-
 src/modules/regchan/libkviregchan.cpp              |  26 ++---
 src/modules/reguser/dialog.cpp                     |  22 ++--
 src/modules/reguser/edituser.cpp                   |  10 +-
 src/modules/reguser/libkvireguser.cpp              |   2 +-
 src/modules/rijndael/libkvirijndael.cpp            |   2 +-
 src/modules/setup/libkvisetup.cpp                  |   2 +-
 src/modules/setup/setupwizard.cpp                  |   6 +-
 src/modules/sharedfile/libkvisharedfile.cpp        |   4 +-
 .../sharedfileswindow/libkvisharedfileswindow.cpp  |   8 +-
 .../sharedfileswindow/sharedfileswindow.cpp        |   4 +-
 src/modules/snd/libkvisnd.cpp                      |   4 +-
 src/modules/str/libkvistr.cpp                      | 118 ++++++++++-----------
 src/modules/system/plugin.cpp                      |   4 +-
 src/modules/theme/packthemedialog.cpp              |   2 +-
 src/modules/theme/savethemedialog.cpp              |   2 +-
 src/modules/theme/themefunctions.cpp               |  12 +--
 src/modules/toolbar/libkvitoolbar.cpp              |  44 ++++----
 src/modules/toolbareditor/toolbareditor.cpp        |   2 +-
 src/modules/url/libkviurl.cpp                      |   4 +-
 src/modules/window/libkviwindow.cpp                |   8 +-
 70 files changed, 550 insertions(+), 550 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index 34344906..ead09cd5 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -108,7 +108,7 @@ static bool action_kvs_cmd_trigger(KviKvsModuleCommandCall * c)
 		{
 			a->activate();
 		} else {
-			if(!c->switches()->tqfind('q',"quiet"))
+			if(!c->switches()->find('q',"quiet"))
 				c->warning(__tr2qs("The action \"%1\" is disabled").tqarg(szName));
 		}
 	} else {
@@ -157,7 +157,7 @@ static bool action_kvs_cmd_enable(KviKvsModuleCommandCall * c)
 	{
 		if(!a->isEnabled())a->setEnabled(true);
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName));
 	}
 
@@ -205,7 +205,7 @@ static bool action_kvs_cmd_disable(KviKvsModuleCommandCall * c)
 	{
 		if(a->isEnabled())a->setEnabled(false);
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName));
 	}
 
@@ -251,11 +251,11 @@ static bool action_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 		{
 			a->suicide();
 		} else {
-			if(!c->switches()->tqfind('q',"quiet"))
+			if(!c->switches()->find('q',"quiet"))
 				c->warning(__tr2qs("The action \"%1\" is a core action and cannot be destroyed").tqarg(szName));
 		}
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The action \"%1\" does not exist").tqarg(szName));
 	}
 
@@ -382,9 +382,9 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c)
 
 	int iFlags = 0;
 	
-	if(c->switches()->tqfind('i',"bind-to-context"))iFlags |= KviAction::NeedsContext;
-	if(c->switches()->tqfind('c',"bind-to-connection"))iFlags |= KviAction::NeedsConnection | KviAction::NeedsContext;
-	if(c->switches()->tqfind('l',"enable-at-login"))
+	if(c->switches()->find('i',"bind-to-context"))iFlags |= KviAction::NeedsContext;
+	if(c->switches()->find('c',"bind-to-connection"))iFlags |= KviAction::NeedsConnection | KviAction::NeedsContext;
+	if(c->switches()->find('l',"enable-at-login"))
 	{
 		if(iFlags & KviAction::NeedsConnection)
 			iFlags |= KviAction::EnableAtLogin;
@@ -396,12 +396,12 @@ static bool action_kvs_cmd_create(KviKvsModuleCallbackCommandCall * c)
 	c->switches()->getAsStringIfExisting('w',"window-types",szWindows);
 	if(!szWindows.isEmpty())
 	{
-		if(szWindows.tqfind('c') != -1)iFlags |= KviAction::WindowChannel;
-		if(szWindows.tqfind('x') != -1)iFlags |= KviAction::WindowConsole;
-		if(szWindows.tqfind('d') != -1)iFlags |= KviAction::WindowDccChat;
-		if(szWindows.tqfind('q') != -1)iFlags |= KviAction::WindowQuery;
+		if(szWindows.find('c') != -1)iFlags |= KviAction::WindowChannel;
+		if(szWindows.find('x') != -1)iFlags |= KviAction::WindowConsole;
+		if(szWindows.find('d') != -1)iFlags |= KviAction::WindowDccChat;
+		if(szWindows.find('q') != -1)iFlags |= KviAction::WindowQuery;
 	}
-	if(c->switches()->tqfind('s',"enable-on-selected"))
+	if(c->switches()->find('s',"enable-on-selected"))
 	{
 		if(iFlags & (KviAction::WindowChannel | KviAction::WindowConsole | KviAction::WindowQuery))
 			iFlags |= KviAction::WindowOnlyIfUsersSelected;
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index d4206564..5957d901 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -427,7 +427,7 @@ void KviSingleActionEditor::setActionData(KviActionData * d)
 		for(i=0;i<m_pCategoryCombo->count();i++)
 		{
 			TQString t = m_pCategoryCombo->text(i);
-			int idx = t.tqfindRev('(');
+			int idx = t.findRev('(');
 			TQString r = t.right(t.length() - (idx + 1));
 			TQString r2 = r.left(r.length() - 1);
 			r2.stripWhiteSpace();
@@ -572,10 +572,10 @@ void KviSingleActionEditor::commit()
 	m_pActionData->m_szSmallIcon = m_pSmallIconEdit->text();
 	m_pActionData->m_szKeySequence = m_pKeySequenceEdit->text();
 	TQString szCat = m_pCategoryCombo->currentText();
-	int idx = szCat.tqfindRev(')');
+	int idx = szCat.findRev(')');
 	if(idx != -1)m_pActionData->m_szCategory = szCat.left(idx);
 	else m_pActionData->m_szCategory = szCat;
-	idx = m_pActionData->m_szCategory.tqfindRev('(');
+	idx = m_pActionData->m_szCategory.findRev('(');
 	if(idx != -1)m_pActionData->m_szCategory.remove(0,idx+1);
 	m_pActionData->m_uFlags = 0;
 	if(m_pNeedsContextCheck->isChecked())
@@ -806,8 +806,8 @@ TQString KviActionEditor::nameForAutomaticAction(const TQString &szTemplate)
 {
 	TQString ret;
 	TQString szT = szTemplate;
-	szT.tqreplace(" ","");
-	szT.tqreplace(".","_");
+	szT.replace(" ","");
+	szT.replace(".","_");
 
 	int i = 1;
 	do {
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index 6e984779..08f18081 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -188,13 +188,13 @@ static bool addon_kvs_cmd_uninstall(KviKvsModuleCommandCall * c)
 	KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(szName);
 	if(a)
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Uninstalling existing addon version %Q"),&(a->version()));
 
 		// uninstall the existing version
-		KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->tqfind('n',"no-callback"));
+		KviKvsScriptAddonManager::instance()->unregisterAddon(szName,c->window(),!c->switches()->find('n',"no-callback"));
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
 	}
 
@@ -234,13 +234,13 @@ static bool addon_kvs_cmd_configure(KviKvsModuleCommandCall * c)
 		TQString ss = a->configureCallbackCode();
 		if(ss.isEmpty())
 		{
-			if(!c->switches()->tqfind('q',"quiet"))
+			if(!c->switches()->find('q',"quiet"))
 				c->warning(__tr2qs("The addon \"%1\" has no configure callback set").tqarg(szName));
 		} else {
 			a->executeConfigureCallback(c->window());
 		}
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
 	}
 
@@ -281,13 +281,13 @@ static bool addon_kvs_cmd_help(KviKvsModuleCommandCall * c)
 		TQString ss = a->helpCallbackCode();
 		if(ss.isEmpty())
 		{
-			if(!c->switches()->tqfind('q',"quiet"))
+			if(!c->switches()->find('q',"quiet"))
 				c->warning(__tr2qs("The addon \"%1\" has no help callback set").tqarg(szName));
 		} else {
 			a->executeHelpCallback(c->window());
 		}
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
 	}
 
@@ -333,7 +333,7 @@ static bool addon_kvs_cmd_setconfigurecallback(KviKvsModuleCallbackCommandCall *
 	{
 		a->setConfigureCallback(c->callback()->code());
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
 	}
 	
@@ -380,7 +380,7 @@ static bool addon_kvs_cmd_sethelpcallback(KviKvsModuleCallbackCommandCall * c)
 	{
 		a->setHelpCallback(c->callback()->code());
 	} else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The addon \"%1\" does not exist").tqarg(szName));
 	}
 	
@@ -549,7 +549,7 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c)
 		return false;
 	}
 
-	if(!c->switches()->tqfind('q',"quiet"))
+	if(!c->switches()->find('q',"quiet"))
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Attempting to register addon \"%Q\" with version %Q"),&(rd.szName),&(rd.szVersion));
 
 	KviKvsScriptAddon * a = KviKvsScriptAddonManager::instance()->findAddon(rd.szName);
@@ -560,18 +560,18 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c)
 		{
 			// and it has a higher version...
 			// complain unless -f is used
-			if(!c->switches()->tqfind('f',"force"))
+			if(!c->switches()->find('f',"force"))
 			{
 				c->error(__tr2qs("The script addon \"%Q\" already exists with version %Q which is higher than %Q"),&(rd.szName),&(a->version()),&(rd.szVersion));
 				return false;
 			}
 		}
 
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Uninstalling existing addon version %Q"),&(a->version()));
 
 		// uninstall the existing version
-		KviKvsScriptAddonManager::instance()->unregisterAddon(rd.szName,c->window(),!c->switches()->tqfind('n',"no-uninstall"));
+		KviKvsScriptAddonManager::instance()->unregisterAddon(rd.szName,c->window(),!c->switches()->find('n',"no-uninstall"));
 	}
 
 	if(!KviKvsScriptAddonManager::instance()->registerAddon(&rd))
@@ -580,7 +580,7 @@ static bool addon_kvs_cmd_register(KviKvsModuleCallbackCommandCall * c)
 		return false;
 	}
 
-	if(!c->switches()->tqfind('q',"quiet"))
+	if(!c->switches()->find('q',"quiet"))
 		c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Script succesfully registered"));
 
 	return true;
diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 5a587792..24c539f2 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -353,7 +353,7 @@ void KviScriptManagementDialog::installScript()
 
 	if(!KviFileDialog::askForOpenFileName(buffer,__tr2qs("Please select the addon installation file"),TQString(),"install.kvs",false,true))return;
 
-	buffer.tqreplace("\\","\\\\");
+	buffer.replace("\\","\\\\");
 
 	TQString szCmd = "parse \"";
 	szCmd += buffer;
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index a8c8c6fe..70fc661b 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -236,7 +236,7 @@ KviAliasEditor::KviAliasEditor(TQWidget * par)
 	TQToolTip::add(m_pRenameButton,__tr2qs("Edit the alias or namespace name"));
 	m_pEditor = KviScriptEditor::createInstance(box);
 	m_pEditor->setFocus();
-	connect(m_pEditor,TQT_SIGNAL(tqfind(const TQString &)),this,TQT_SLOT(slotFindWord(const TQString &)));
+	connect(m_pEditor,TQT_SIGNAL(find(const TQString &)),this,TQT_SLOT(slotFindWord(const TQString &)));
 	connect(m_pEditor,TQT_SIGNAL(replaceAll(const TQString &,const TQString &)),this,TQT_SLOT(slotReplaceAll(const TQString &,const TQString &)));
 
 	m_pContextPopup = new KviTalPopupMenu(this);
@@ -487,10 +487,10 @@ void KviAliasEditor::recursiveSearchReplace(const TQString &szSearch,KviAliasEdi
 	if(!it)return;
 	if(it->isAlias())
 	{
-		if(((KviAliasListViewItem *)it)->buffer().tqfind(szSearch,0,false) != -1)
+		if(((KviAliasListViewItem *)it)->buffer().find(szSearch,0,false) != -1)
 		{
 			it->setPixmap(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIASHIGHLIGHTED)));
-			if (bReplace) ((TQString &)((KviAliasListViewItem *)it)->buffer()).tqreplace(szSearch,szReplace,false);
+			if (bReplace) ((TQString &)((KviAliasListViewItem *)it)->buffer()).replace(szSearch,szReplace,false);
 			openParentItems(it);
 		} else
 			it->setPixmap(0,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ALIAS)));
@@ -606,7 +606,7 @@ void KviAliasEditor::exportSelectionInSinglesFiles(KviPointerList<KviAliasListVi
 		getExportAliasBuffer(tmp,it);
 		TQString szFileName=buildFullItemName(it);
 		szFileName += ".kvs";
-		szFileName.tqreplace("::","_");
+		szFileName.replace("::","_");
 		TQString szCompletePath=m_szDir+szFileName;
 	
 		if (KviFileUtils::fileExists(szCompletePath) && !bReplaceAll)
@@ -672,7 +672,7 @@ void KviAliasEditor::exportAliases(bool bSelectedOnly,bool bSingleFiles)
 	if (count==1)
 	{
 			TQString tmp=buildFullItemName(tempitem);
-			szNameFile = tmp.tqreplace("::","_");
+			szNameFile = tmp.replace("::","_");
 	}
 	else szNameFile="aliases";
 	szName += szNameFile;
@@ -894,8 +894,8 @@ TQString KviAliasEditor::askForAliasName(const TQString &szAction,const TQString
 		}
 		// make sure that we have only doubled "::" and not ":" or ":::..."
 		TQString tmp = szNewName;
-		tmp.tqreplace("::","@"); // @ is not allowed by the rule above
-		if(tmp.tqfind(":") != -1)
+		tmp.replace("::","@"); // @ is not allowed by the rule above
+		if(tmp.find(":") != -1)
 		{
 			g_pAliasEditorModule->lock();
 			TQMessageBox::information(this,
@@ -906,7 +906,7 @@ TQString KviAliasEditor::askForAliasName(const TQString &szAction,const TQString
 			szNewName = "";
 			continue;
 		}
-		if(tmp.tqfind("@@") != -1)
+		if(tmp.find("@@") != -1)
 		{
 			g_pAliasEditorModule->lock();
 			TQMessageBox::information(this,
@@ -963,8 +963,8 @@ TQString KviAliasEditor::askForNamespaceName(const TQString &szAction,const TQSt
 		}
 		// make sure that we have only doubled "::" and not ":" or ":::..."
 		TQString tmp = szNewName;
-		tmp.tqreplace("::","@"); // @ is not allowed by the rule above
-		if(tmp.tqfind(":") != -1)
+		tmp.replace("::","@"); // @ is not allowed by the rule above
+		if(tmp.find(":") != -1)
 		{
 			g_pAliasEditorModule->lock();
 			TQMessageBox::information(this,
@@ -975,7 +975,7 @@ TQString KviAliasEditor::askForNamespaceName(const TQString &szAction,const TQSt
 			szNewName = "";
 			continue;
 		}
-		if(tmp.tqfind("@@") != -1)
+		if(tmp.find("@@") != -1)
 		{
 			g_pAliasEditorModule->lock();
 			TQMessageBox::information(this,
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index a7098eb4..a71f4974 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -118,7 +118,7 @@ void KviAsyncAvatarSelectionDialog::okClicked()
 	if(!m_szAvatarName.isEmpty())
 	{
 		TQString tmp = m_szAvatarName;
-		tmp.tqreplace("\\","\\\\");
+		tmp.replace("\\","\\\\");
 		TQString szBuffer=TQString("avatar.set \"%1\"").tqarg(tmp);
 		KviKvsScript::run(szBuffer,m_pConnection->console());
 	}
@@ -199,7 +199,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 	
 	// new avatar specified...try to load it
 
-	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->tqfind(c->window()->connection()->currentNickName());
+	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->find(c->window()->connection()->currentNickName());
 	if(!e)
 	{
 		c->warning(__tr2qs("Internal error: I'm not in the user database ?"));
@@ -227,7 +227,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 			g_pIconManager->urlToCachedFileName(szLocalFile);
 			g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApp::Avatars,szLocalFile);
 
-			szLocalFilePath.tqreplace("\\","\\\\");
+			szLocalFilePath.replace("\\","\\\\");
 
 			TQString szCommand = "http.get -w=nm ";
 				szCommand += szAvatar;
@@ -277,7 +277,7 @@ static bool avatar_kvs_cmd_unset(KviKvsModuleCommandCall * c)
 {
 	KVSM_RETQUIRE_CONNECTION(c)
 
-	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->tqfind(c->window()->connection()->currentNickName());
+	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->find(c->window()->connection()->currentNickName());
 	if(!e)
 	{
 		c->warning(__tr2qs("Internal error: I'm not in the user database ?"));
@@ -343,16 +343,16 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
 	KVSM_RETQUIRE_CONNECTION(c)
 
 	kvs_int_t iTimeout = (kvs_int_t)KVI_OPTION_UINT(KviOption_uintAvatarOfferTimeoutInSecs);
-	if(KviKvsVariant * pTimeout = c->switches()->tqfind('t',"timeout"))
+	if(KviKvsVariant * pTimeout = c->switches()->find('t',"timeout"))
 	{
 		if(!pTimeout->asInteger(iTimeout))
 		{
-			if(!c->switches()->tqfind('q',"quiet"))
+			if(!c->switches()->find('q',"quiet"))
 				c->warning(__tr2qs("Invalid timeout specified, using default"));
 		}
 	}
 
-	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->tqfind(c->window()->connection()->currentNickName());
+	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->find(c->window()->connection()->currentNickName());
 	if(!e)
 	{
 		c->warning(__tr2qs("Internal error: I'm not in the user database ?"));
@@ -370,7 +370,7 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
 	KviSharedFile * o = 0;
 	if((!absPath.isEmpty()) && (!avatar.isEmpty()))
 	{
-		bool bTargetIsChan = (szTarget.tqcontains('#') || szTarget.tqcontains('&') || szTarget.tqcontains('!'));
+		bool bTargetIsChan = (szTarget.contains('#') || szTarget.contains('&') || szTarget.contains('!'));
 		if(bTargetIsChan)o = g_pSharedFilesManager->lookupSharedFile(avatar,0);
 		else {
 			KviIrcMask u(szTarget);
@@ -385,21 +385,21 @@ static bool avatar_kvs_cmd_notify(KviKvsModuleCommandCall * c)
 			if(!o)
 			{
 				// Don't delete o...it has been already deleted by g_pFileTrader
-				if(!c->switches()->tqfind('q',"quiet"))
+				if(!c->switches()->find('q',"quiet"))
 					c->warning(__tr2qs("Can't add a file offer for file %Q (huh ? file not readable ?)"),&absPath);
 				return true;
 			}
 
 			if(_OUTPUT_VERBOSE)
 			{
-				if(!c->switches()->tqfind('q',"quiet"))
+				if(!c->switches()->find('q',"quiet"))
 					c->window()->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Added %d secs file offer for file %Q (%Q) and receiver %Q"),
 						iTimeout,&(o->absFilePath()),&avatar,&(o->userMask()));
 			}
 		}
 	}
 
-	if(!c->switches()->tqfind('q',"quiet"))
+	if(!c->switches()->find('q',"quiet"))
 		c->window()->output(KVI_OUT_AVATAR,__tr2qs("Notifying avatar '%Q' to %Q"),&avatar,&szTarget);
 
 	KviTQCString encodedTarget = c->window()->connection()->encodeText(szTarget);
@@ -454,7 +454,7 @@ static bool avatar_kvs_fnc_name(KviKvsModuleFunctionCall * c)
 
 	if(szNick.isEmpty())szNick = c->window()->connection()->currentNickName();
 
-	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->tqfind(szNick);
+	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->find(szNick);
 	if(e)
 	{
 		if(e->avatar())
@@ -498,7 +498,7 @@ static bool avatar_kvs_fnc_path(KviKvsModuleFunctionCall * c)
 
 	if(szNick.isEmpty())szNick = c->window()->connection()->currentNickName();
 
-	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->tqfind(szNick);
+	KviIrcUserEntry * e = c->window()->connection()->userDataBase()->find(szNick);
 	if(e)
 	{
 		if(e->avatar())
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index b7600f81..174f28be 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -1094,20 +1094,20 @@ static bool chan_kvs_fnc_users(KviKvsModuleFunctionCall * c)
 	KviUserListEntry * e = ch->userListView()->firstItem(); // Thnx Julien :)
 
 	bool bCheckMask = !szMask.isEmpty();
-	bool bOp = szFlags.tqfind('o',false) != -1;
-	bool bVoice = szFlags.tqfind('v',false) != -1;
-	bool bHalfOp = szFlags.tqfind('h',false) != -1;
-	bool bChanAdmins = szFlags.tqfind('a',false) != -1;
-	bool bUserOp = szFlags.tqfind('u',false) != -1;
-	bool bNone = szFlags.tqfind('n',false) != -1;
+	bool bOp = szFlags.find('o',false) != -1;
+	bool bVoice = szFlags.find('v',false) != -1;
+	bool bHalfOp = szFlags.find('h',false) != -1;
+	bool bChanAdmins = szFlags.find('a',false) != -1;
+	bool bUserOp = szFlags.find('u',false) != -1;
+	bool bNone = szFlags.find('n',false) != -1;
 	bool bCheckFlags = bOp || bVoice || bHalfOp || bNone || bChanAdmins || bUserOp;
-	bool bAddMask = szFlags.tqfind('m',false) != -1;
+	bool bAddMask = szFlags.find('m',false) != -1;
 
 	int idx = 0;
 
 	if(bAddMask || bCheckFlags || bCheckMask)
 	{
-		bool bMaskMustMatch = szFlags.tqfind('i',false) == -1;
+		bool bMaskMustMatch = szFlags.find('i',false) == -1;
 		KviIrcMask tqmask(szMask);
 
 		while(e)
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index 348dbe8f..97c92ec8 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -92,12 +92,12 @@ static bool config_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	
 	KviConfig::FileMode fileMode;
 	
-	if(szMode.tqcontains('r'))
+	if(szMode.contains('r'))
 	{
-		if(szMode.tqcontains('w'))fileMode = KviConfig::ReadWrite;
+		if(szMode.contains('w'))fileMode = KviConfig::ReadWrite;
 		else fileMode = KviConfig::Read;
 	} else {
-		if(szMode.tqcontains('w'))fileMode = KviConfig::Write;
+		if(szMode.contains('w'))fileMode = KviConfig::Write;
 		else fileMode = KviConfig::ReadWrite;
 	}
 	
@@ -211,7 +211,7 @@ static bool config_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("default",KVS_PT_STRING,KVS_PF_OPTIONAL,szDefault)
 	KVSM_PARAMETERS_END(c)
 	
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -247,7 +247,7 @@ static bool config_kvs_fnc_section(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 	
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -285,7 +285,7 @@ static bool config_kvs_fnc_readonly(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 	
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -323,7 +323,7 @@ static bool config_kvs_fnc_filename(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 	
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -360,7 +360,7 @@ static bool config_kvs_fnc_hassection(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szSect)
 	KVSM_PARAMETERS_END(c)
 	
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -396,7 +396,7 @@ static bool config_kvs_fnc_sectionlist(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 	
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -440,11 +440,11 @@ static bool config_kvs_fnc_keylist(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 	
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
-		KviConfigGroup * d = cfg->dict()->tqfind(cfg->group());
+		KviConfigGroup * d = cfg->dict()->find(cfg->group());
 		if(!d)return true;
 
 		KviConfigGroupIterator it(*d);
@@ -528,7 +528,7 @@ static bool config_kvs_cmd_close(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId) 
 	KVSM_PARAMETERS_END(c) 
 
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -575,7 +575,7 @@ static bool config_kvs_cmd_flush(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId) 
 	KVSM_PARAMETERS_END(c) 
 
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -619,7 +619,7 @@ static bool config_kvs_cmd_clear(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_STRING,0,szId) 
 	KVSM_PARAMETERS_END(c) 
 
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -663,7 +663,7 @@ static bool config_kvs_cmd_clearsection(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("section",KVS_PT_STRING,0,szSect)
 	KVSM_PARAMETERS_END(c) 
 
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -713,7 +713,7 @@ static bool config_kvs_cmd_write(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("value",KVS_PT_STRING,0,szVal)
 	KVSM_PARAMETERS_END(c) 
 
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
@@ -756,7 +756,7 @@ static bool config_kvs_cmd_setsection(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("section",KVS_PT_STRING,0,szSect)
 	KVSM_PARAMETERS_END(c) 
 
-	KviConfig * cfg = g_pConfigDict->tqfind(szId);
+	KviConfig * cfg = g_pConfigDict->find(szId);
 	
 	if(cfg)
 	{
diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index d183ebbf..4110c213 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -92,7 +92,7 @@ KviDccZeroPortTag * KviDccBroker::addZeroPortTag()
 
 KviDccZeroPortTag * KviDccBroker::findZeroPortTag(const TQString &szTag)
 {
-	KviDccZeroPortTag * t = m_pZeroPortTags->tqfind(szTag);
+	KviDccZeroPortTag * t = m_pZeroPortTags->find(szTag);
 	if(!t)return 0;
 	if(t->m_tTimestamp.secsTo(TQDateTime::tqcurrentDateTime()) > 180)
 	{
@@ -206,7 +206,7 @@ void KviDccBroker::rsendExecute(KviDccDescriptor * dcc)
 	dcc->szFileName = TQFileInfo(dcc->szFileName).fileName();
 
 	TQString fName = dcc->szFileName;
-	fName.tqreplace(' ',"\\040"); // be cool :)
+	fName.replace(' ',"\\040"); // be cool :)
 
 	TQString szTag;
 	if(dcc->isZeroPortRequest())
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 65c37175..e007a3cb 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -68,7 +68,7 @@ void KviCanvasRectangleItem::setProperty(const TQString &property,const TQVarian
 {
 	if(m_properties[property].isValid())
 	{
-		m_properties.tqreplace(property,val);
+		m_properties.replace(property,val);
 		hide();
 		show();
 	}
@@ -141,7 +141,7 @@ void KviCanvasPolygon::setProperty(const TQString &property,const TQVariant &val
 {
 	if(m_properties[property].isValid())
 	{
-		m_properties.tqreplace(property,val);
+		m_properties.replace(property,val);
 		if((property == "clrForeground") || (property == "uLineWidth"))
 		{
 			setPen(TQPen(m_properties["clrForeground"].asColor(),m_properties["uLineWidth"].toInt()));
@@ -227,7 +227,7 @@ void KviCanvasEllipticItem::setProperty(const TQString & property,const TQVarian
 {
 	if(m_properties[property].isValid())
 	{
-		m_properties.tqreplace(property,val);
+		m_properties.replace(property,val);
 		if((property == "clrForeground") || (property == "uLineWidth"))
 		{
 			setPen(TQPen(m_properties["clrForeground"].asColor(),m_properties["uLineWidth"].toInt()));
@@ -356,7 +356,7 @@ void KviCanvasRectangle::setProperty(const TQString &property,const TQVariant &v
 {
 	if(m_properties[property].isValid())
 	{
-		m_properties.tqreplace(property,val);
+		m_properties.replace(property,val);
 		if((property == "clrForeground") || (property == "uLineWidth"))
 		{
 			setPen(TQPen(m_properties["clrForeground"].asColor(),m_properties["uLineWidth"].toInt()));
@@ -439,7 +439,7 @@ KviCanvasLine::~KviCanvasLine()
 
 void KviCanvasLine::setProperty(const TQString &property,const TQVariant &val)
 {
-	m_properties.tqreplace(property,val);
+	m_properties.replace(property,val);
 	if((property == "uLineWidth") || (property == "clrForeground"))
 	{
 		setPen(TQPen(m_properties["clrForeground"].asColor(),m_properties["uLineWidth"].toInt()));
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index 71108210..b21b0561 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -65,7 +65,7 @@ KviDccDescriptor::KviDccDescriptor(KviConsole * pConsole)
 		g_pDescriptorDict = new KviPointerHashTable<int,KviDccDescriptor>;
 		g_pDescriptorDict->setAutoDelete(false);
 	}
-	g_pDescriptorDict->tqreplace((long)m_uId,this);
+	g_pDescriptorDict->replace((long)m_uId,this);
 
 	szNick       = __tr_ctx("unknown","dcc");
 	szUser       = szNick;
@@ -148,10 +148,10 @@ void KviDccDescriptor::triggerCreationEvent()
 }
 
 
-KviDccDescriptor * KviDccDescriptor::tqfind(unsigned int uId)
+KviDccDescriptor * KviDccDescriptor::find(unsigned int uId)
 {
 	if(!g_pDescriptorDict)return 0;
-	return g_pDescriptorDict->tqfind((long)uId);
+	return g_pDescriptorDict->find((long)uId);
 }
 
 /*
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index 49a705ce..68d76528 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -70,7 +70,7 @@ public:
 
 	unsigned int id() const { return m_uId; };
 	const TQString & idString() const { return m_szId; };
-	static KviDccDescriptor * tqfind(unsigned int uId);
+	static KviDccDescriptor * find(unsigned int uId);
 	static KviPointerHashTable<int,KviDccDescriptor> * descriptorDict();
 
 	void triggerCreationEvent(); // this MUST be called by the creator of the descriptor!
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 50717e77..3cb5a7c7 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -73,9 +73,9 @@ static void dcc_module_set_dcc_type(KviDccDescriptor * d,const char * szBaseType
 
 static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCommandCall *c)
 {
-	d->bIsTdcc = c->switches()->tqfind('t',"tdcc");
+	d->bIsTdcc = c->switches()->find('t',"tdcc");
 
-	KviKvsVariant * pSw = c->switches()->tqfind('m',"minimize");
+	KviKvsVariant * pSw = c->switches()->find('m',"minimize");
 
 	if(pSw != 0)
 		d->bOverrideMinimize = pSw->asBoolean();
@@ -85,7 +85,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 	if(!d->console())
 	{
 		// We don't need a console with -c and -n , otherwise we need it
-		if(!(c->switches()->tqfind('c',"connect") || c->switches()->tqfind('n',"no-ctcp")))
+		if(!(c->switches()->find('c',"connect") || c->switches()->find('n',"no-ctcp")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("This window has no associated IRC context (an IRC context is required unless -c or -n are passed)","dcc"));
@@ -98,7 +98,7 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 	if(!d->console()->isConnected())
 	{
 		// We don't need a connection with -c and -n , otherwise we need it
-		if(!(c->switches()->tqfind('c',"connect") || c->switches()->tqfind('n',"no-ctcp")))
+		if(!(c->switches()->find('c',"connect") || c->switches()->find('n',"no-ctcp")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("You're not connected to a server (an active connection is required unless -c or -n are passed)","dcc"));
@@ -118,10 +118,10 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 		d->szLocalHost  = d->console()->connection()->userInfo()->hostName();
 	}
 
-	if(pSw = c->switches()->tqfind('i',"ip"))
+	if(pSw = c->switches()->find('i',"ip"))
 	{
 		pSw->asString(d->szListenIp);
-		if(!(d->szListenIp.tqcontains('.') || d->szListenIp.tqcontains(':')))
+		if(!(d->szListenIp.contains('.') || d->szListenIp.contains(':')))
 		{
 			// This will magically work with the same buffer as source and dst!
 			if(!KviNetUtils::getInterfaceAddress(d->szListenIp,d->szListenIp))
@@ -142,13 +142,13 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 		d->szListenIp=tmp;
 	}
 
-	if(pSw = c->switches()->tqfind('p',"port"))
+	if(pSw = c->switches()->find('p',"port"))
 	{
 		pSw->asString(d->szListenPort); // fixme!
 	}
 	else d->szListenPort = "0"; // any port is ok
 
-	if(pSw = c->switches()->tqfind('a',"fake-address"))
+	if(pSw = c->switches()->find('a',"fake-address"))
 	{
 		pSw->asString(d->szFakeIp);
 	}
@@ -160,16 +160,16 @@ static bool dcc_kvs_parse_default_parameters(KviDccDescriptor * d,KviKvsModuleCo
 		}
 	}
 
-	if(pSw = c->switches()->tqfind('f',"fake-port"))
+	if(pSw = c->switches()->find('f',"fake-port"))
 	{
 		pSw->asString(d->szFakePort);
 	}
 
-	d->bDoTimeout = (!c->switches()->tqfind('u',"unlimited"));
+	d->bDoTimeout = (!c->switches()->find('u',"unlimited"));
 #ifdef COMPILE_SSL_SUPPORT
-	d->bIsSSL = c->switches()->tqfind('s',"ssl");
+	d->bIsSSL = c->switches()->find('s',"ssl");
 #else
-	if(c->switches()->tqfind('s',"ssl"))c->warning(__tr2qs_ctx("This executable was built without SSL support, -s switch ignored","dcc"));
+	if(c->switches()->find('s',"ssl"))c->warning(__tr2qs_ctx("This executable was built without SSL support, -s switch ignored","dcc"));
 #endif
 
 	return true;
@@ -411,7 +411,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 	if(!dcc_kvs_parse_default_parameters(d,c))return false;
 	dcc_module_set_dcc_type(d,"CHAT");
 
-	if(c->switches()->tqfind('z',"zero-port"))
+	if(c->switches()->find('z',"zero-port"))
 	{
 		// we want to have it reversed... add a tag and send out the request
 		KviDccZeroPortTag * t = g_pDccBroker->addZeroPortTag();
@@ -426,9 +426,9 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	if(c->switches()->tqfind('c',"connect"))
+	if(c->switches()->find('c',"connect"))
 	{
-		if(!(c->switches()->tqfind('i',"ip") && c->switches()->tqfind('p',"port")))
+		if(!(c->switches()->find('i',"ip") && c->switches()->find('p',"port")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("-c requires -i and -p","dcc"));
@@ -443,7 +443,7 @@ static bool dcc_kvs_cmd_chat(KviKvsModuleCommandCall * c)
 		d->szIp         = __tr2qs_ctx("unknown","dcc");
 		d->szPort       = d->szIp;
 		d->bActive      = false;
-		d->bSendRequest = !c->switches()->tqfind('n',"no-ctcp");
+		d->bSendRequest = !c->switches()->find('n',"no-ctcp");
 	}
 	
 	//c->window()->output(0,"%Q %Q %Q",&(d->szIp),&(d->szPort),&(d->szListenIp));
@@ -618,7 +618,7 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 	TQString szTmp;
 	KviKvsVariant * pSw = 0;
 
-	if(pSw = c->switches()->tqfind('g',"get"))
+	if(pSw = c->switches()->find('g',"get"))
 	{
 		d->szFileName = TQFileInfo(szFileName).fileName();
 
@@ -642,16 +642,16 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 	d->szUser            = __tr2qs_ctx("unknown","dcc"); // username is always unknown
 	d->szHost            = d->szUser;                 // host is always unknown
 	d->bRecvFile         = pSw != 0;
-	d->bNoAcks           = c->switches()->tqfind('b',"blind") || c->switches()->tqfind('t',"tdcc");
+	d->bNoAcks           = c->switches()->find('b',"blind") || c->switches()->find('t',"tdcc");
 	d->bResume           = false;
 	d->bAutoAccept       = pSw != 0;
 	d->bIsIncomingAvatar = false;
 
 	if(!dcc_kvs_parse_default_parameters(d,c))return false;
 
-	if(c->switches()->tqfind('c',"connect"))
+	if(c->switches()->find('c',"connect"))
 	{
-		if(!(c->switches()->tqfind('i',"ip") && c->switches()->tqfind('p',"port")))
+		if(!(c->switches()->find('i',"ip") && c->switches()->find('p',"port")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("-c requires -i and -p","dcc"));
@@ -666,10 +666,10 @@ static bool dcc_kvs_cmd_send(KviKvsModuleCommandCall * c)
 		d->szIp         = __tr2qs_ctx("unknown","dcc");
 		d->szPort       = d->szIp;
 		d->bActive      = false;
-		d->bSendRequest = !c->switches()->tqfind('n',"no-ctcp");
+		d->bSendRequest = !c->switches()->find('n',"no-ctcp");
 	}
 
-	if(c->switches()->tqfind('g',"get"))
+	if(c->switches()->find('g',"get"))
 	{
 		dcc_module_set_dcc_type(d,"RECV");
 		d->triggerCreationEvent();
@@ -815,8 +815,8 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 	d->bActive           = false; // we have to listen!
 	d->bResume           = false; 
 	d->bRecvFile         = true;  // we have to receive the file!
-	d->bSendRequest      = !c->switches()->tqfind('n',"no-ctcp");
-	d->bNoAcks           = d->bIsTdcc || c->switches()->tqfind('b',"blind");
+	d->bSendRequest      = !c->switches()->find('n',"no-ctcp");
+	d->bNoAcks           = d->bIsTdcc || c->switches()->find('b',"blind");
 	d->bAutoAccept       = KVI_OPTION_BOOL(KviOption_boolAutoAcceptDccSend);
 	d->bIsIncomingAvatar = g_pApp->findPendingAvatarChange(d->console(),d->szNick,d->szFileName);
 
@@ -883,14 +883,14 @@ static bool dcc_kvs_cmd_rsend(KviKvsModuleCommandCall * c)
 	KviDccDescriptor * d = new KviDccDescriptor(c->window()->console());
 	d->szNick            = szTarget;
 	d->szLocalFileName   = szFileName;
-	d->bIsTdcc           = c->switches()->tqfind('t',"tdcc");
+	d->bIsTdcc           = c->switches()->find('t',"tdcc");
 #ifdef COMPILE_SSL_SUPPORT
-	d->bIsSSL            = c->switches()->tqfind('s',"ssl");
+	d->bIsSSL            = c->switches()->find('s',"ssl");
 #else
-	if(c->switches()->tqfind('s',"ssl"))c->warning(__tr2qs_ctx("This executable has been built without SSL support, -s switch ignored","dcc"));
+	if(c->switches()->find('s',"ssl"))c->warning(__tr2qs_ctx("This executable has been built without SSL support, -s switch ignored","dcc"));
 #endif //!COMPILE_SSL_SUPPORT
 
-	if(c->switches()->tqfind('z',"zero-port"))
+	if(c->switches()->find('z',"zero-port"))
 	{
 		dcc_module_set_dcc_type(d,"SEND");
 		d->setZeroPortRequestTag("nonempty"); // just to tag it
@@ -947,7 +947,7 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
 
 	KviTQString::cutToLast(szFileName,'/');
 
-	if(szFileName.tqcontains(' '))
+	if(szFileName.contains(' '))
 	{
 		szFileName.prepend('"');
 		szFileName.append('"');
@@ -955,11 +955,11 @@ static bool dcc_kvs_cmd_get(KviKvsModuleCommandCall * c)
 
 	KviStr szDCC("GET");
 #ifdef COMPILE_SSL_SUPPORT
-	if(c->switches()->tqfind('s',"ssl"))szDCC.prepend('S');
+	if(c->switches()->find('s',"ssl"))szDCC.prepend('S');
 #else
-	if(c->switches()->tqfind('s',"ssl"))c->warning(__tr2qs_ctx("This executable has no SSL support, -s switch ignored","dcc"));
+	if(c->switches()->find('s',"ssl"))c->warning(__tr2qs_ctx("This executable has no SSL support, -s switch ignored","dcc"));
 #endif
-	if(c->switches()->tqfind('t',"tdcc"))szDCC.prepend('T');
+	if(c->switches()->find('t',"tdcc"))szDCC.prepend('T');
 
 	if(uSize == 0)
 	{
@@ -1124,7 +1124,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 
 	if(!dcc_kvs_parse_default_parameters(d,c))return false;
 
-	if(KviKvsVariant * pSR = c->switches()->tqfind('h',"sample-rate"))
+	if(KviKvsVariant * pSR = c->switches()->find('h',"sample-rate"))
 	{
 		kvs_int_t iSR;
 		if(!pSR->asInteger(iSR))
@@ -1138,7 +1138,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 
 	d->szCodec = "adpcm";
 
-	if(KviKvsVariant * pCodec = c->switches()->tqfind('g',"codec"))
+	if(KviKvsVariant * pCodec = c->switches()->find('g',"codec"))
 	{
 		TQString szCodec;
 		pCodec->asString(szCodec);
@@ -1151,9 +1151,9 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 	}
 
 	dcc_module_set_dcc_type(d,"VOICE");
-	if(c->switches()->tqfind('c',"connect"))
+	if(c->switches()->find('c',"connect"))
 	{
-		if(!(c->switches()->tqfind('i',"ip") && c->switches()->tqfind('p',"port")))
+		if(!(c->switches()->find('i',"ip") && c->switches()->find('p',"port")))
 		{
 			delete d;
 			c->error(__tr2qs_ctx("-c requires -i and -p","dcc"));
@@ -1171,7 +1171,7 @@ static bool dcc_kvs_cmd_voice(KviKvsModuleCommandCall * c)
 		d->szIp         = __tr2qs_ctx("unknown","dcc");
 		d->szPort       = d->szIp;
 		d->bActive      = false;
-		d->bSendRequest = !(c->switches()->tqfind('n',"no-ctcp"));
+		d->bSendRequest = !(c->switches()->find('n',"no-ctcp"));
 
 		d->triggerCreationEvent();
 		g_pDccBroker->passiveVoiceExecute(d);
@@ -1244,7 +1244,7 @@ static bool dcc_module_cmd_canvas(KviModule *m,KviCommand *c)
 	if(c->hasSwitch('i'))
 	{
 		c->getSwitchValue('i',d->szListenIp);
-		if(!(d->szListenIp.tqcontains('.') || d->szListenIp.tqcontains(':')))
+		if(!(d->szListenIp.contains('.') || d->szListenIp.contains(':')))
 		{
 			// This will magically work with the same buffer as source and dst!
 			if(!kvi_getInterfaceAddress(d->szListenIp.ptr(),d->szListenIp))
@@ -1577,7 +1577,7 @@ static KviDccDescriptor * dcc_kvs_find_dcc_descriptor(const kvs_uint_t &uId,KviK
 			c->warning(__tr2qs_ctx("The current window has no associated DCC session","dcc"));
 		return dcc;
 	}
-	dcc = KviDccDescriptor::tqfind(uId);
+	dcc = KviDccDescriptor::find(uId);
 	if((!dcc) && bWarn)
 		c->warning(__tr2qs_ctx("The specified parameter is not a valid DCC identifier","dcc"));
 	return dcc;
@@ -1615,7 +1615,7 @@ static bool dcc_kvs_cmd_abort(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->tqfind('q',"quiet"));
+	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
 
 	if(dcc)
 	{
@@ -1655,11 +1655,11 @@ static bool dcc_kvs_cmd_setBandwidthLimit(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("dcc_id",KVS_PT_UINT,KVS_PF_OPTIONAL,uDccId)
 	KVSM_PARAMETERS_END(c)
 
-	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->tqfind('q',"quiet"));
+	KviDccDescriptor * dcc = dcc_kvs_find_dcc_descriptor(uDccId,c,!c->switches()->find('q',"quiet"));
 	if(dcc)
 	{
 		if (dcc->transfer())dcc->transfer()->setBandwidthLimit(uVal);
-		else if (!c->switches()->tqfind('q',"quiet"))c->warning(__tr2qs_ctx("This DCC session is not a DCC transfer session","dcc"));
+		else if (!c->switches()->find('q',"quiet"))c->warning(__tr2qs_ctx("This DCC session is not a DCC transfer session","dcc"));
 	}
 	return true;
 }
@@ -2614,9 +2614,9 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 			++it;
 		}
 	} else {
-		bool bWantFileUploads = szFlags.tqfind('u',false) != -1;
-		bool bWantFileDownloads = szFlags.tqcontains('d',false) != -1;
-		bool bWantChats = szFlags.tqcontains('c',false) != -1;
+		bool bWantFileUploads = szFlags.find('u',false) != -1;
+		bool bWantFileDownloads = szFlags.contains('d',false) != -1;
+		bool bWantChats = szFlags.contains('c',false) != -1;
 
 		while(KviDccDescriptor * dcc = it.current())
 		{
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 29e6b424..4eed2393 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -263,9 +263,9 @@ static void dccModuleParseDccChat(KviDccRequest *dcc)
 	szExtensions.cutRight(4); // cut off CHAT
 
 #ifdef COMPILE_SSL_SUPPORT
-	bool bSSLExtension   = szExtensions.tqcontains('S',false);
+	bool bSSLExtension   = szExtensions.contains('S',false);
 #else //!COMPILE_SSL_SUPPORT
-	if(szExtensions.tqcontains('S',false))
+	if(szExtensions.contains('S',false))
 	{
 		dcc_module_request_error(dcc,__tr2qs_ctx("This executable has been compiled without SSL support, the SSL extension to DCC CHAT is not available","dcc"));
 		return;
@@ -444,7 +444,7 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 		dcc->szParam4 = __tr2qs_ctx("<unknown size>","dcc");
 	}
 
-	if(dcc->szParam1.tqcontains('/'))
+	if(dcc->szParam1.contains('/'))
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
@@ -457,11 +457,11 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 	KviStr szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off SEND
 
-	bool bTurboExtension = szExtensions.tqcontains('T',false);
+	bool bTurboExtension = szExtensions.contains('T',false);
 #ifdef COMPILE_SSL_SUPPORT
-	bool bSSLExtension   = szExtensions.tqcontains('S',false);
+	bool bSSLExtension   = szExtensions.contains('S',false);
 #else //!COMPILE_SSL_SUPPORT
-	if(szExtensions.tqcontains('S',false))
+	if(szExtensions.contains('S',false))
 	{
 		dcc_module_request_error(dcc,__tr2qs_ctx("This executable has been compiled without SSL support, the SSL extension to DCC SEND is not available","dcc"));
 		return;
@@ -592,7 +592,7 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 		dcc->szParam4 = "0";
 	}
 
-	if(dcc->szParam1.tqcontains('/'))
+	if(dcc->szParam1.contains('/'))
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
@@ -605,11 +605,11 @@ static void dccModuleParseDccRecv(KviDccRequest * dcc)
 	KviStr szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off RECV
 
-	bool bTurboExtension = szExtensions.tqcontains('T',false);
+	bool bTurboExtension = szExtensions.contains('T',false);
 #ifdef COMPILE_SSL_SUPPORT
-	bool bSSLExtension   = szExtensions.tqcontains('S',false);
+	bool bSSLExtension   = szExtensions.contains('S',false);
 #else //!COMPILE_SSL_SUPPORT
-	if(szExtensions.tqcontains('S',false))
+	if(szExtensions.contains('S',false))
 	{
 		dcc_module_request_error(dcc,__tr2qs_ctx("This executable has been compiled without SSL support, the SSL extension to DCC RECV is not available","dcc"));
 		return;
@@ -730,7 +730,7 @@ static void dccModuleParseDccRSend(KviDccRequest *dcc)
 		dcc->szParam2 = __tr_ctx("<unknown size>","dcc");
 	}
 
-	if(dcc->szParam1.tqcontains('/'))
+	if(dcc->szParam1.contains('/'))
 	{
 		if(!dcc->ctcpMsg->msg->haltOutput())
 		{
@@ -743,11 +743,11 @@ static void dccModuleParseDccRSend(KviDccRequest *dcc)
 	KviStr szExtensions = dcc->szType;
 	szExtensions.cutRight(4); // cut off SEND
 
-	bool bTurboExtension = szExtensions.tqcontains('T',false);
+	bool bTurboExtension = szExtensions.contains('T',false);
 #ifdef COMPILE_SSL_SUPPORT
-	bool bSSLExtension   = szExtensions.tqcontains('S',false);
+	bool bSSLExtension   = szExtensions.contains('S',false);
 #else //!COMPILE_SSL_SUPPORT
-	if(szExtensions.tqcontains('S',false))
+	if(szExtensions.contains('S',false))
 	{
 		dcc_module_request_error(dcc,__tr2qs_ctx("This executable has been compiled without SSL support, the SSL extension to DCC RSEND is not available","dcc"));
 		return;
@@ -826,11 +826,11 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 	KviStr szExtensions = dcc->szType;
 	szExtensions.cutRight(3); // cut off GET
 
-	bool bTurboExtension = szExtensions.tqcontains('T',false);
+	bool bTurboExtension = szExtensions.contains('T',false);
 #ifdef COMPILE_SSL_SUPPORT
-	bool bSSLExtension   = szExtensions.tqcontains('S',false);
+	bool bSSLExtension   = szExtensions.contains('S',false);
 #else //!COMPILE_SSL_SUPPORT
-	if(szExtensions.tqcontains('S',false))
+	if(szExtensions.contains('S',false))
 	{
 		dcc_module_request_error(dcc,__tr2qs_ctx("This executable has been compiled without SSL support, the SSL extension to DCC GET is not available","dcc"));
 		return;
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index c42793aa..74586112 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1532,7 +1532,7 @@ void KviDccFileTransfer::connectionInProgress()
 
 		// BUG-TO-BUG mIrc compatibility
 		if(KVI_OPTION_BOOL(KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores))
-			tmp.tqreplace(" ","_");
+			tmp.replace(" ","_");
 
 		KviServerParser::encodeCtcpParameter(tmp.utf8().data(),fName);
 		// Zero port requests want DCC SEND as back-request
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index a40b9b8f..52b0e10f 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -467,7 +467,7 @@ static bool dialog_kvs_cmd_textinput(KviKvsModuleCallbackCommandCall * c)
 	if(c->hasSwitch('b',"modal")) modal=true;
 	else modal=false;
 	KviKvsCallbackTextInput * box = new KviKvsCallbackTextInput(
-			szCaption,szInfoText,szDefaultText,szIcon,c->switches()->tqfind('m',"multiline"),
+			szCaption,szInfoText,szDefaultText,szIcon,c->switches()->find('m',"multiline"),
 			szButton0,szButton1,szButton2,szCmd,&params,c->window(),modal);
 	box->show();
 
@@ -741,8 +741,8 @@ static bool dialog_kvs_cmd_image(KviKvsModuleCallbackCommandCall * c)
 
 	int iType = 0;
 
-	if(szType.tqcontains('s'))iType |= KID_TYPE_BUILTIN_IMAGES_SMALL;
-	if(szType.tqcontains('f'))iType |= KID_TYPE_FULL_PATH;
+	if(szType.contains('s'))iType |= KID_TYPE_BUILTIN_IMAGES_SMALL;
+	if(szType.contains('f'))iType |= KID_TYPE_FULL_PATH;
 	if(szType.isEmpty())iType = KID_TYPE_ALL;
 
 	if(iMaxSize < 1)iMaxSize = 256000;
diff --git a/src/modules/dockwidget/libkvidockwidget_qt3.cpp b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
index afee8824..f734d288 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt3.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt3.cpp
@@ -343,9 +343,9 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt)
 				line = b->kviWindow()->lastMessageText();
 				if(!line.isEmpty())
 				{
-					line.tqreplace(TQChar('&'),"&amp;");
-					line.tqreplace(TQChar('<'),"&lt;");
-					line.tqreplace(TQChar('>'),"&gt;");
+					line.replace(TQChar('&'),"&amp;");
+					line.replace(TQChar('<'),"&lt;");
+					line.replace(TQChar('>'),"&gt;");
 					tmp += "<b>";
 					tmp += b->kviWindow()->plainTextCaption();
 					tmp += "</b><br>";
@@ -641,7 +641,7 @@ void KviDockWidget::paintEvent(TQPaintEvent * event)
 }
 
 
-static KviDockWidget * dockwidget_tqfind(KviFrame *f)
+static KviDockWidget * dockwidget_find(KviFrame *f)
 {
 	if(!g_pDockWidgetList)return 0;
 	for(KviDockWidget * w = g_pDockWidgetList->first();w;w = g_pDockWidgetList->next())
@@ -687,7 +687,7 @@ static KviDockWidget * dockwidget_tqfind(KviFrame *f)
 
 static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
 {
-	if(!(dockwidget_tqfind(c->window()->frame())))
+	if(!(dockwidget_find(c->window()->frame())))
 	{
 		KviDockWidget * w = new KviDockWidget(c->window()->frame(),"dock_widget");
 #ifndef COMPILE_ON_WINDOWS
@@ -717,7 +717,7 @@ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
 
 static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 {
-	KviDockWidget * w= dockwidget_tqfind(c->window()->frame());
+	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
 	// show the tqparent frame.. otherwise there will be no way to get it back
 	if(!c->window()->frame()->isVisible())
@@ -745,7 +745,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 
 static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 {
-	KviDockWidget * w= dockwidget_tqfind(c->window()->frame());
+	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)
 	{
 		w->setPrevWindowState(c->window()->frame()->windowState());
@@ -772,7 +772,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 
 static bool dockwidget_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c)
 {
-	c->returnValue()->setBoolean(dockwidget_tqfind(c->window()->frame()));
+	c->returnValue()->setBoolean(dockwidget_find(c->window()->frame()));
 	return true;
 }
 
diff --git a/src/modules/dockwidget/libkvidockwidget_qt4.cpp b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
index c8ad4092..76316941 100644
--- a/src/modules/dockwidget/libkvidockwidget_qt4.cpp
+++ b/src/modules/dockwidget/libkvidockwidget_qt4.cpp
@@ -178,9 +178,9 @@ void KviDockWidget::tipRequest(KviDynamicToolTip *tip,const TQPoint &pnt)
 				line = b->kviWindow()->lastMessageText();
 				if(!line.isEmpty())
 				{
-					line.tqreplace(TQChar('&'),"&amp;");
-					line.tqreplace(TQChar('<'),"&lt;");
-					line.tqreplace(TQChar('>'),"&gt;");
+					line.replace(TQChar('&'),"&amp;");
+					line.replace(TQChar('<'),"&lt;");
+					line.replace(TQChar('>'),"&gt;");
 					tmp += "<b>";
 					tmp += b->kviWindow()->plainTextCaption();
 					tmp += "</b><br>";
@@ -476,7 +476,7 @@ void KviDockWidget::updateIcon()
 }
 
 
-static KviDockWidget * dockwidget_tqfind(KviFrame *f)
+static KviDockWidget * dockwidget_find(KviFrame *f)
 {
 	if(!g_pDockWidgetList)return 0;
 	for(KviDockWidget * w = g_pDockWidgetList->first();w;w = g_pDockWidgetList->next())
@@ -522,7 +522,7 @@ static KviDockWidget * dockwidget_tqfind(KviFrame *f)
 
 static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
 {
-	if(!(dockwidget_tqfind(c->window()->frame())))
+	if(!(dockwidget_find(c->window()->frame())))
 	{
 		KviDockWidget * w = new KviDockWidget(c->window()->frame());
 		w->show();
@@ -548,7 +548,7 @@ static bool dockwidget_kvs_cmd_show(KviKvsModuleCommandCall * c)
 
 static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 {
-	KviDockWidget * w= dockwidget_tqfind(c->window()->frame());
+	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)delete w;
 	// show the tqparent frame.. otherwise there will be no way to get it back
 	if(!c->window()->frame()->isVisible())
@@ -576,7 +576,7 @@ static bool dockwidget_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 
 static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 {
-	KviDockWidget * w= dockwidget_tqfind(c->window()->frame());
+	KviDockWidget * w= dockwidget_find(c->window()->frame());
 	if(w)
 	{
 		c->window()->frame()->hide();
@@ -602,7 +602,7 @@ static bool dockwidget_kvs_cmd_hidewindow(KviKvsModuleCommandCall * c)
 
 static bool dockwidget_kvs_fnc_isvisible(KviKvsModuleFunctionCall * c)
 {
-	c->returnValue()->setBoolean(dockwidget_tqfind(c->window()->frame()));
+	c->returnValue()->setBoolean(dockwidget_find(c->window()->frame()));
 	return true;
 }
 
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index cc9ca7c2..498da234 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -102,7 +102,7 @@ void KviCompletionBox::updateContents(TQString buffer)
 	TQString szModule;
 	TQChar* pCur = (TQChar *)buffer.ucs2();
 	
-	int pos=buffer.tqfind('.');
+	int pos=buffer.find('.');
 	
 	if(pos>0)
 	{
@@ -479,8 +479,8 @@ void KviScriptEditorWidget::getWordOnCursor(TQString &buffer,int index) const
 {
 	TQRegExp re("[ \t=,\\(\\)\"}{\\[\\]\r\n+-*><;@!]");
 	//debug("BUFFER IS %s",buffer.utf8().data());
-	int start = buffer.tqfindRev(re,index);
-	int end = buffer.tqfind(re,index);
+	int start = buffer.findRev(re,index);
+	int end = buffer.find(re,index);
 
 	TQString tmp;
 	if(start!=end)
@@ -528,11 +528,11 @@ void KviScriptEditorWidget::getWordBeforeCursor(TQString &buffer,int index,bool
 {
 	TQString tmp = buffer.left(index);
 	buffer=tmp;
-	int idx = buffer.tqfindRev(' ');
-	int idx1 = buffer.tqfindRev("=");
-	int idx2 = buffer.tqfindRev(','); 
-	int idx3 = buffer.tqfindRev('(');
-	int idx4 = buffer.tqfindRev('"');
+	int idx = buffer.findRev(' ');
+	int idx1 = buffer.findRev("=");
+	int idx2 = buffer.findRev(','); 
+	int idx3 = buffer.findRev('(');
+	int idx4 = buffer.findRev('"');
 	if(idx1 > idx) idx= idx1;	
 	if(idx2 > idx)idx = idx2;
 	if(idx3 > idx)idx = idx3;
@@ -812,7 +812,7 @@ int KviScriptSyntaxHighlighter::highlightParagraph(const TQString &text,int endS
 		int index=0;
 		while (i)
 		{
-			index=text.tqfind(szFind,index,false);
+			index=text.find(szFind,index,false);
 			if (index != -1)
 			{
 				setFormat(index,szFind.length(),g_clrFind);
@@ -876,7 +876,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(TQWidget * par)
 	g->setColStretch(1,1);
 	g->setColStretch(2,10);
 	g->addWidget(m_pFindLineedit,1,2);
-	TQLabel *lab= new TQLabel("tqfind",this);
+	TQLabel *lab= new TQLabel("find",this);
 	lab->setText(tr("Find"));
 
 	g->addWidget(lab,1,1);
@@ -926,7 +926,7 @@ bool KviScriptEditorImplementation::isModified()
 
 void KviScriptEditorImplementation::slotFind()
 {
-	emit tqfind(m_pFindLineedit->text());
+	emit find(m_pFindLineedit->text());
 
 }
 void KviScriptEditorImplementation::slotNextFind(const TQString &text)
@@ -1177,10 +1177,10 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( TQWidget* tqparent,
 	tqlayout->addWidget( findNext, 2, 3 );
 	findNext->setEnabled(false);
 
-	tqreplace = new TQPushButton(this, "tqreplace" );	
-	tqreplace->setText(tr("&Replace(WIP)"));
-	tqlayout->addWidget( tqreplace, 3, 3 );
-	tqreplace->setEnabled(false);
+	replace = new TQPushButton(this, "replace" );	
+	replace->setText(tr("&Replace(WIP)"));
+	tqlayout->addWidget( replace, 3, 3 );
+	replace->setEnabled(false);
 
 #ifndef COMPILE_USE_QT4
     clearWState( WState_Polished );
@@ -1209,7 +1209,7 @@ void KviScriptEditorReplaceDialog::slotReplace()
 {
 	TQString txt=((KviScriptEditorWidget *)m_pParent)->text();
 	if (checkReplaceAll->isChecked()) emit replaceAll(m_pFindlineedit->text(),m_pReplacelineedit->text());
-	txt.tqreplace(m_pFindlineedit->text(),m_pReplacelineedit->text(),false);
+	txt.replace(m_pFindlineedit->text(),m_pReplacelineedit->text(),false);
 	((KviScriptEditorWidget *)m_pParent)->setText(txt);
 	((KviScriptEditorWidget *)m_pParent)->setModified(true);
 	m_pFindlineedit->setText("");
diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index f37c7ab2..91635726 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -65,7 +65,7 @@ public:
 	virtual ~KviScriptEditorWidget();
 public:
 	void updateOptions();
-	void tqfind1();
+	void find1();
 	TQString m_szFind;
 	KviCompletionBox *completelistbox;
 	void completition(bool bCanComplete = 1);
@@ -165,7 +165,7 @@ protected slots:
 	void slotInitFind();
 	void slotNextFind(const TQString &);
 signals:
-	void tqfind( const TQString &);
+	void find( const TQString &);
 	void replaceAll( const TQString &, const TQString &);
 	void initFind();
 	void nextFind(const TQString &);
@@ -184,7 +184,7 @@ protected:
 	TQLabel *findlabel;
 	TQLabel *replacelabel;
 	TQPushButton *replacebutton;
-	TQPushButton *tqreplace;
+	TQPushButton *replace;
 	TQPushButton *findNext;
 
 //	TQPushButton *cancelbutton;
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 264423ff..14ddad5b 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -73,7 +73,7 @@ static bool file_kvs_cmd_copy(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 	KviFileUtils::adjustFilePath(szSrc);
 	KviFileUtils::adjustFilePath(szDst);
-	if(KviFileUtils::fileExists(szDst) && !c->switches()->tqfind('o',"overwrite"))
+	if(KviFileUtils::fileExists(szDst) && !c->switches()->find('o',"overwrite"))
 	{
 		c->warning(__tr2qs("Destinaion file exists: no copy made"));
 		return true;
@@ -113,7 +113,7 @@ static bool file_kvs_cmd_addimagepath(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 	KviFileUtils::adjustFilePath(szDst);
 
-	TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).tqfind(szDst);
+	TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).find(szDst);
 	if(it == KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end())
 		KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).append(szDst);
 	return true;
@@ -146,7 +146,7 @@ static bool file_kvs_cmd_delimagepath(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 	KviFileUtils::adjustFilePath(szDst);
 
-	TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).tqfind(szDst);
+	TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).find(szDst);
 	if(it == KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).end())
 		KVI_OPTION_STRINGLIST(KviOption_stringlistImageSearchPaths).remove(szDst);
 	return true;
@@ -194,10 +194,10 @@ static bool file_kvs_cmd_write(KviKvsModuleCommandCall * c)
 	KviFileUtils::adjustFilePath(szFileName);
 
 	bool bRet;
-	if(c->switches()->tqfind('l',"local-8-bit"))
-		bRet = KviFileUtils::writeFileLocal8Bit(szFileName,szData,c->switches()->tqfind('a',"append"));
+	if(c->switches()->find('l',"local-8-bit"))
+		bRet = KviFileUtils::writeFileLocal8Bit(szFileName,szData,c->switches()->find('a',"append"));
 	else
-		bRet = KviFileUtils::writeFile(szFileName,szData,c->switches()->tqfind('a',"append"));
+		bRet = KviFileUtils::writeFile(szFileName,szData,c->switches()->find('a',"append"));
 
 	if(!bRet)
 		c->warning(__tr2qs("Failed to write to file %Q: the destination couldn't be opened"),&szFileName);
@@ -318,7 +318,7 @@ static bool file_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 	KviFileUtils::adjustFilePath(szName);
 	if(!KviFileUtils::removeFile(szName))
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("Failed to remove the file %Q"),&szName);
 	}
 	return true;
@@ -361,7 +361,7 @@ static bool file_kvs_cmd_rmdir(KviKvsModuleCommandCall * c)
 	KviFileUtils::adjustFilePath(szName);
 	if(!KviFileUtils::removeDir(szName))
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("Failed to remove the directory %Q"),&szName);
 	}
 	return true;
@@ -636,14 +636,14 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 #endif
 	if(szFlags.isEmpty())iFlags = TQDir::Dirs | TQDir::Files | TQDir::NoSymLinks | TQDir::Readable | TQDir::Writable | TQDir::Executable | TQDir::Hidden | TQDir::System;
 	else {
-		if(szFlags.tqfind('d',false) != -1)iFlags |= TQDir::Dirs;
-		if(szFlags.tqfind('f',false) != -1)iFlags |= TQDir::Files;
-		if(szFlags.tqfind('l',false) == -1)iFlags |= TQDir::NoSymLinks;
-		if(szFlags.tqfind('r',false) != -1)iFlags |= TQDir::Readable;
-		if(szFlags.tqfind('w',false) != -1)iFlags |= TQDir::Writable;
-		if(szFlags.tqfind('x',false) != -1)iFlags |= TQDir::Executable;
-		if(szFlags.tqfind('h',false) != -1)iFlags |= TQDir::Hidden;
-		if(szFlags.tqfind('s',false) != -1)iFlags |= TQDir::System;
+		if(szFlags.find('d',false) != -1)iFlags |= TQDir::Dirs;
+		if(szFlags.find('f',false) != -1)iFlags |= TQDir::Files;
+		if(szFlags.find('l',false) == -1)iFlags |= TQDir::NoSymLinks;
+		if(szFlags.find('r',false) != -1)iFlags |= TQDir::Readable;
+		if(szFlags.find('w',false) != -1)iFlags |= TQDir::Writable;
+		if(szFlags.find('x',false) != -1)iFlags |= TQDir::Executable;
+		if(szFlags.find('h',false) != -1)iFlags |= TQDir::Hidden;
+		if(szFlags.find('s',false) != -1)iFlags |= TQDir::System;
 	}
 #ifdef COMPILE_USE_QT4
 	TQFlags<TQDir::SortFlag> iSort = 0;
@@ -652,12 +652,12 @@ static bool file_kvs_fnc_ls(KviKvsModuleFunctionCall * c)
 #endif
 	if(szFlags.isEmpty())iSort = TQDir::Unsorted;
 	else {
-		if(szFlags.tqfind('n',false) != -1)iSort |= TQDir::Name;
-		if(szFlags.tqfind('t',false) != -1)iSort |= TQDir::Time;
-		if(szFlags.tqfind('b',false) != -1)iSort |= TQDir::Size;
-		if(szFlags.tqfind('z',false) != -1)iSort |= TQDir::DirsFirst;
-		if(szFlags.tqfind('k',false) != -1)iSort |= TQDir::Reversed;
-		if(szFlags.tqfind('i',false) != -1)iSort |= TQDir::IgnoreCase;
+		if(szFlags.find('n',false) != -1)iSort |= TQDir::Name;
+		if(szFlags.find('t',false) != -1)iSort |= TQDir::Time;
+		if(szFlags.find('b',false) != -1)iSort |= TQDir::Size;
+		if(szFlags.find('z',false) != -1)iSort |= TQDir::DirsFirst;
+		if(szFlags.find('k',false) != -1)iSort |= TQDir::Reversed;
+		if(szFlags.find('i',false) != -1)iSort |= TQDir::IgnoreCase;
 	}
 
 	TQStringList sl;
@@ -759,7 +759,7 @@ static bool file_kvs_fnc_read(KviKvsModuleFunctionCall * c)
 
 	buf[uReaded] = '\0';
 
-	if(szFlags.tqfind('l',false) == -1)
+	if(szFlags.find('l',false) == -1)
 		c->returnValue()->setString(TQString::fromUtf8(buf));
 	else
 		c->returnValue()->setString(TQString::fromLocal8Bit(buf));
@@ -828,7 +828,7 @@ static bool file_kvs_fnc_readLines(KviKvsModuleFunctionCall * c)
 	if(c->params()->count() < 2)iStartLine = 0;
 	if(c->params()->count() < 3)iCount = -1;
 
-	bool bLocal8Bit = szFlags.tqfind('l',0,false) != -1;
+	bool bLocal8Bit = szFlags.find('l',0,false) != -1;
 
 	KviKvsArray * a = new KviKvsArray();
 
@@ -914,16 +914,16 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 	KviFile f(szFile);
 	int iFlags = IO_WriteOnly;
 
-	if(!f.openForWriting(c->switches()->tqfind('a',"append")))
+	if(!f.openForWriting(c->switches()->find('a',"append")))
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("Can't open the file \"%Q\" for writing"),&szFile);
 		return true;
 	}
 
-	bool bLocal8Bit = c->switches()->tqfind('l',"local-8-bit");
-	bool bNoSeparator = c->switches()->tqfind('n',"no-separator");
-	bool bAddCR = c->switches()->tqfind('c',"crlf");
+	bool bLocal8Bit = c->switches()->find('l',"local-8-bit");
+	bool bNoSeparator = c->switches()->find('n',"no-separator");
+	bool bAddCR = c->switches()->find('c',"crlf");
 
 	unsigned int u = 0;
 	while(u < a.array()->size())
@@ -963,7 +963,7 @@ static bool file_kvs_cmd_writeLines(KviKvsModuleCommandCall * c)
 		<string> $file.localdir([relative_path:string])
 	@description:
 		Returns the path to the KVIrc local data directory.[br]
-		The KVIrc local data directory is always writeable and tqcontains
+		The KVIrc local data directory is always writeable and contains
 		the various subdirectories that KVIrc uses internally: audio , avatars ,
 		config , help , incoming , log , modules , msgcolors and pics.[br]
 		If <relative_path> is passed , then it is appended at the end of the directory
@@ -1114,7 +1114,7 @@ static bool file_kvs_fnc_cwd(KviKvsModuleFunctionCall * c)
 		$file.globaldir
 	@description:
 		Returns the path to the KVIrc global data directory.[br]
-		The KVIrc local data directory is always readable but usually not writeable and tqcontains
+		The KVIrc local data directory is always readable but usually not writeable and contains
 		the various subdirectories that KVIrc uses internally: audio , avatars ,
 		config , help , incoming , log , modules , msgcolors and pics.[br]
 		If <relative_path> is passed , then it is appended at the end of the directory
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index b34b843f..f6068378 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -460,7 +460,7 @@ void KviFileTransferWindow::openLocalFileTerminal()
 	if(!t)return;
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
-	int idx = tmp.tqfindRev("/");
+	int idx = tmp.findRev("/");
 	if(idx == -1)return;
 	tmp = tmp.left(idx);
     tmp.append("\"");
@@ -476,7 +476,7 @@ void KviFileTransferWindow::openLocalFileTerminal()
 		TQString tmp = t->localFileName();
 		if(tmp.isEmpty())return;
 
-		int idx = tmp.tqfindRev("/");
+		int idx = tmp.findRev("/");
 		if(idx == -1)return;
 		tmp = tmp.left(idx);
 
@@ -518,7 +518,7 @@ void KviFileTransferWindow::openLocalFile()
 	if(!t)return;
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
-	tmp.tqreplace("/","\\");
+	tmp.replace("/","\\");
 	ShellExecute(0,"open",tmp.local8Bit().data(),NULL,NULL,SW_SHOWNORMAL);  //You have to link the shell32.lib
 #else //!COMPILE_ON_WINDOWS
 // G&N end
@@ -553,7 +553,7 @@ void KviFileTransferWindow::openLocalFileWith()
 	if(!t)return;
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
-	tmp.tqreplace("/","\\");
+	tmp.replace("/","\\");
 	tmp.prepend("rundll32.exe shell32.dll,OpenAs_RunDLL "); // this if to show the 'open with...' window
 	WinExec(tmp.local8Bit().data(),SW_SHOWNORMAL);
 #else //!COMPILE_ON_WINDOWS
@@ -598,7 +598,7 @@ void KviFileTransferWindow::openLocalFileFolder()
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
 	tmp=TQFileInfo(tmp).dirPath(TRUE);
-	tmp.tqreplace('/','\\');
+	tmp.replace('/','\\');
 	tmp.prepend("explorer.exe ");
 	WinExec(tmp.local8Bit().data(), SW_MAXIMIZE);
 #else //!COMPILE_ON_WINDOWS
@@ -609,7 +609,7 @@ void KviFileTransferWindow::openLocalFileFolder()
 		TQString tmp = t->localFileName();
 		if(tmp.isEmpty())return;
 
-		int idx = tmp.tqfindRev("/");
+		int idx = tmp.findRev("/");
 		if(idx == -1)return;
 		tmp = tmp.left(idx);
 
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 1fe2217e..8a4c7e29 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -45,7 +45,7 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 	{
 		if(s->pParams)
 		{
-			if(TQVariant * v = s->pParams->tqfind("bCreateMinimized"))
+			if(TQVariant * v = s->pParams->find("bCreateMinimized"))
 			{
 				if(v->isValid())
 				{
@@ -65,7 +65,7 @@ static KviModuleExtension * filetransferwindow_extension_alloc(KviModuleExtensio
 
 	if(s->pParams)
 	{
-		if(TQVariant * v = s->pParams->tqfind("bNoRaise"))
+		if(TQVariant * v = s->pParams->find("bNoRaise"))
 		{
 			if(v)
 			{
@@ -108,8 +108,8 @@ static bool filetransferwindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 		KviPointerHashTable<TQString,TQVariant> dict(17,true);
 		dict.setAutoDelete(true);
 		TQString dummy;
-		dict.tqreplace("bCreateMinimized",new TQVariant(c->hasSwitch('m',dummy)));
-		dict.tqreplace("bNoRaise",new TQVariant(c->hasSwitch('n',dummy)));
+		dict.replace("bCreateMinimized",new TQVariant(c->hasSwitch('m',dummy)));
+		dict.replace("bNoRaise",new TQVariant(c->hasSwitch('n',dummy)));
 
 		d->allocate(c->window(),&dict,0);
 	} else {
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index 73216c9e..82003488 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -168,11 +168,11 @@ void KviHelpWindow::startSearch()
 {
 
     TQString str = m_pTermsEdit->text();
-    str = str.tqreplace( "\'", "\"" );
-    str = str.tqreplace( "`", "\"" );
+    str = str.replace( "\'", "\"" );
+    str = str.replace( "`", "\"" );
     TQString buf = str;
-    str = str.tqreplace( "-", " " );
-    str = str.tqreplace( TQRegExp( "\\s[\\S]?\\s" ), " " );
+    str = str.replace( "-", " " );
+    str = str.replace( TQRegExp( "\\s[\\S]?\\s" ), " " );
     m_terms = TQStringList::split( " ", str );
     TQStringList termSeq;
     TQStringList seqWords;
@@ -180,32 +180,32 @@ void KviHelpWindow::startSearch()
     for ( ; it != m_terms.end(); ++it ) {
 	(*it) = (*it).simplifyWhiteSpace();
 	(*it) = (*it).lower();
-	(*it) = (*it).tqreplace( "\"", "" );
+	(*it) = (*it).replace( "\"", "" );
     }
-    if ( str.tqcontains( '\"' ) ) {
+    if ( str.contains( '\"' ) ) {
 #ifdef COMPILE_USE_QT4
 	if ( (str.count( '\"' ))%2 == 0 ) {
 #else
-	if ( (str.tqcontains( '\"' ))%2 == 0 ) {
+	if ( (str.contains( '\"' ))%2 == 0 ) {
 #endif
 	    int beg = 0;
 	    int end = 0;
 	    TQString s;
-	    beg = str.tqfind( '\"', beg );
+	    beg = str.find( '\"', beg );
 	    while ( beg != -1 ) {
 		beg++;
-		end = str.tqfind( '\"', beg );
+		end = str.find( '\"', beg );
 		s = str.mid( beg, end - beg );
 		s = s.lower();
 		s = s.simplifyWhiteSpace();
-		if ( s.tqcontains( '*' ) ) {
+		if ( s.contains( '*' ) ) {
 		    TQMessageBox::warning( this, tr( "Full Text Search" ),
 			tr( "Using a wildcard within phrases is not allowed." ) );
 		    return;
 		}
 		seqWords += TQStringList::split( ' ', s );
 		termSeq << s;
-		beg = str.tqfind( '\"', end + 1);
+		beg = str.find( '\"', end + 1);
 	    }
 	} else {
 	    TQMessageBox::warning( this, tr( "Full Text Search" ),
@@ -261,7 +261,7 @@ TQTextBrowser * KviHelpWindow::textBrowser()
 void KviHelpWindow::showIndexTopic()
 {
 	if (m_pIndexSearch->text().isEmpty()|| !m_pIndexListBox->selectedItem()) return;
-	int i=g_pDocIndex->titlesList().tqfindIndex(m_pIndexListBox->selectedItem()->text());
+	int i=g_pDocIndex->titlesList().findIndex(m_pIndexListBox->selectedItem()->text());
 	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
 }
 
@@ -283,13 +283,13 @@ void KviHelpWindow::searchInIndex( const TQString &s )
 
 void KviHelpWindow::indexSelected ( int index )
 {
-	int i=g_pDocIndex->titlesList().tqfindIndex(m_pIndexListBox->text(index));
+	int i=g_pDocIndex->titlesList().findIndex(m_pIndexListBox->text(index));
 	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
 }
 
 void KviHelpWindow::searchSelected ( int index )
 {
-	int i=g_pDocIndex->titlesList().tqfindIndex(m_pResultBox->text(index));
+	int i=g_pDocIndex->titlesList().findIndex(m_pResultBox->text(index));
 	textBrowser()->setSource(g_pDocIndex->documentList()[ i ]);
 }
 
diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp
index ba5e72f3..46dc4f22 100755
--- a/src/modules/help/index.cpp
+++ b/src/modules/help/index.cpp
@@ -329,7 +329,7 @@ TQStringList Index::query( const TQStringList &terms, const TQStringList &termSe
 
 	Entry *e = 0;
 
-	if ( (*it).tqcontains( '*' ) ) {
+	if ( (*it).contains( '*' ) ) {
 
 	    KviValueList<Document> wcts = setupDummyTerm( getWildcardTerms( *it ) );
 
@@ -464,9 +464,9 @@ TQString Index::getDocumentTitle( const TQString &fileName )
 
 
 
-    int start = text.tqfind( "<title>", 0, FALSE ) + 7;
+    int start = text.find( "<title>", 0, FALSE ) + 7;
 
-    int end = text.tqfind( "</title>", 0, FALSE );
+    int end = text.find( "</title>", 0, FALSE );
 
 
 
@@ -521,11 +521,11 @@ TQStringList Index::getWildcardTerms( const TQString &term )
 
 	    }
 
-	    index = text.tqfind( *iter, index );
+	    index = text.find( *iter, index );
 
 	    if ( *iter == terms.last() && index != (int)text.length()-1 ) {
 
-		index = text.tqfindRev( *iter );
+		index = text.findRev( *iter );
 
 		if ( index != (int)text.length() - (int)(*iter).length() ) {
 
@@ -577,7 +577,7 @@ TQStringList Index::split( const TQString &str )
 
     int j = 0;
 
-    int i = str.tqfind( '*', j );
+    int i = str.find( '*', j );
 
 
 
@@ -593,7 +593,7 @@ TQStringList Index::split( const TQString &str )
 
 	j = i + 1;
 
-	i = str.tqfind( '*', j );
+	i = str.find( '*', j );
 
     }
 
@@ -663,7 +663,7 @@ KviValueList<Document> Index::setupDummyTerm( const TQStringList &terms )
 
 	for ( docIt = docs.begin(); docIt != docs.end(); ++docIt ) {
 
-	    if ( maxList.tqfindIndex( *docIt ) == -1 )
+	    if ( maxList.findIndex( *docIt ) == -1 )
 
 		maxList.append( *docIt );
 
@@ -823,7 +823,7 @@ bool Index::searchForPattern( const TQStringList &patterns, const TQStringList &
 
 	    while ( aIt != a.end() ) {
 
-		if ( b.tqfind( *aIt + 1 ) != b.end() ) {
+		if ( b.find( *aIt + 1 ) != b.end() ) {
 
 		    (*aIt)++;
 
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index af594088..9fcb36ec 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -157,7 +157,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 			doc = "nohelpavailable.html";
 	}
 
-	if(!c->switches()->tqfind('n',"new"))
+	if(!c->switches()->find('n',"new"))
 	{
 		KviHelpWidget * w = (KviHelpWidget *)c->window()->frame()->child("help_widget","KviHelpWidget");
 		if(w)
@@ -166,7 +166,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c)
 			return true;
 		}
 	}
-	if(c->switches()->tqfind('m',"mdi")) 
+	if(c->switches()->find('m',"mdi")) 
 	{
 		KviHelpWindow *w = new KviHelpWindow(c->window()->frame(),"Help browser");
 		w->textBrowser()->setSource(doc);
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index 8b98b218..6e880840 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -50,13 +50,13 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,TQString &szUrl,TQ
 
 	if(szFileName.isEmpty())
 	{
-		if(c->switches()->tqfind('a',"auto-file-name"))
+		if(c->switches()->find('a',"auto-file-name"))
 		{
 			tmp = szUrl;
-			tmp.tqreplace('/',"_");
-			tmp.tqreplace(':',"_");
-			tmp.tqreplace('@',"_");
-			tmp.tqreplace('?',"_");
+			tmp.replace('/',"_");
+			tmp.replace(':',"_");
+			tmp.replace('@',"_");
+			tmp.replace('?',"_");
 			// http____path_path2_path3_filename.ext
 			g_pApp->getLocalKvircDirectory(szFileName,KviApp::Incoming,tmp);
 		} else {
@@ -68,7 +68,7 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,TQString &szUrl,TQ
 
 	KviHttpFileTransfer * hft = new KviHttpFileTransfer();
 
-	bool bHead = c->switches()->tqfind('h',"head");
+	bool bHead = c->switches()->find('h',"head");
 
 	if(c->switches()->getAsStringIfExisting('p',"post-data",tmp))
 	{
@@ -114,25 +114,25 @@ static bool http_kvs_complete_get(KviKvsModuleCommandCall * c,TQString &szUrl,TQ
 
 	if(c->switches()->getAsStringIfExisting('w',"winctrl",tmp))
 	{
-		if(!tmp.tqcontains('h'))hft->invokeTransferWindow(c->window(),tmp.tqcontains('m'),tmp.tqcontains('n'));
+		if(!tmp.contains('h'))hft->invokeTransferWindow(c->window(),tmp.contains('m'),tmp.contains('n'));
 	} else {
 		hft->invokeTransferWindow(c->window(),false,false);
 	}
 
-	KviKvsVariant * v = c->switches()->tqfind('i',"identifier");
+	KviKvsVariant * v = c->switches()->find('i',"identifier");
 	if(v)
 		hft->setMagicIdentifier(*v);
 
-	if(c->switches()->tqfind('q',"quiet"))
+	if(c->switches()->find('q',"quiet"))
 		hft->setNotifyCompletion(false);
 	
-	if(c->switches()->tqfind('y',"no-output"))
+	if(c->switches()->find('y',"no-output"))
 		hft->setNoOutput(true);
 		
 	if(!szCallback.isEmpty())
 		hft->setCompletionCallback(szCallback);
 
-	if(c->switches()->tqfind('c',"clear"))
+	if(c->switches()->find('c',"clear"))
 		hft->setAutoClean(true);
 
 	if(!hft->startDownload())
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 73fda996..90873c33 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -229,7 +229,7 @@ void KviLinksWindow::endOfLinks()
 				maxHops = l->hops;
 				szMaxHop = l->host;
 			}
-			if(l->host.tqcontains('*'))wildServers++;
+			if(l->host.contains('*'))wildServers++;
 			it = insertLink(l);
 			if(!it){
 				output(KVI_OUT_SYSTEMERROR,__tr2qs("Broken link: Missing tqparent (%s) for %s (%d hops): %s (used /LINKS <tqmask> ?)"),
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index cf5c7a95..6007636a 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -69,8 +69,8 @@ static bool logview_kvs_cmd_open(KviKvsModuleCommandCall * c)
 		KviPointerHashTable<TQString,TQVariant> dict(17,true);
 		dict.setAutoDelete(true);
 		TQString dummy;
-		dict.tqreplace("bCreateMinimized",new TQVariant(c->hasSwitch('m',dummy)));
-		dict.tqreplace("bNoRaise",new TQVariant(c->hasSwitch('n',dummy)));
+		dict.replace("bCreateMinimized",new TQVariant(c->hasSwitch('m',dummy)));
+		dict.replace("bNoRaise",new TQVariant(c->hasSwitch('n',dummy)));
 
 		d->allocate(c->window(),&dict,0);
 	} else {
@@ -88,7 +88,7 @@ static KviModuleExtension * logview_extension_alloc(KviModuleExtensionAllocStruc
 	{
 		if(s->pParams)
 		{
-			if(TQVariant * v = s->pParams->tqfind("bCreateMinimized"))
+			if(TQVariant * v = s->pParams->find("bCreateMinimized"))
 			{
 				if(v->isValid())
 				{
@@ -108,7 +108,7 @@ static KviModuleExtension * logview_extension_alloc(KviModuleExtensionAllocStruc
 
 	if(s->pParams)
 	{
-		if(TQVariant * v = s->pParams->tqfind("bNoRaise"))
+		if(TQVariant * v = s->pParams->find("bNoRaise"))
 		{
 			if(v)
 			{
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 8b99165e..91badb3d 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -1310,7 +1310,7 @@ MP_KVS_FUNCTION(getEqData)
 
 	MP_KVS_FAIL_ON_NO_INTERFACE
 
-	bool bQuiet = szOptions.tqfind('q',false) != -1;
+	bool bQuiet = szOptions.find('q',false) != -1;
 
 	int ret = g_pMPInterface->getEqData(iValue);
 
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 394dedf5..bdd21f1a 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -70,18 +70,18 @@ int KviMircServersIniImport::doImport(const TQString& filename)
 				TQString port;
 				kvi_u32_t uPort = 0;
 				// <description>SERVER:<server:port>GROUP:<network>
-				int idx = KviTQString::tqfind(entry,"SERVER:");
+				int idx = KviTQString::find(entry,"SERVER:");
 				if(idx != -1)
 				{
 					description = entry.left(idx);
 					entry.remove(0,idx + 7);
-					idx = KviTQString::tqfind(entry,"GROUP:");
+					idx = KviTQString::find(entry,"GROUP:");
 					if(idx != -1)
 					{
 						port = entry.left(idx);
 						entry.remove(0,idx + 6);
 					}
-					idx = KviTQString::tqfind(port,':');
+					idx = KviTQString::find(port,':');
 					if(idx != -1)
 					{
 						serv = port.left(idx);
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index 91583241..e0f080a1 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -220,7 +220,7 @@ void KviNotifierWindow::addMessage(KviWindow * pWnd,const TQString &szImageId,co
 {
 	TQPixmap * pIcon;
 	TQString szMessage=szText;
-	szMessage.tqreplace( TQRegExp("\r([^\r])*\r([^\r])+\r"), "\\2" );
+	szMessage.replace( TQRegExp("\r([^\r])*\r([^\r])+\r"), "\\2" );
 	if(szImageId.isEmpty())pIcon = 0;
 	else pIcon = g_pIconManager->getImage(szImageId);
 
@@ -715,12 +715,12 @@ void KviNotifierWindow::redrawText()
 	KviNotifierMessage * last = l->last();
 
 	// make sure that we can loop
-	int iIdx = l->tqfindRef(cur);
+	int iIdx = l->findRef(cur);
 	if(iIdx == -1)
 	{
 		tab->setCurrentMessage(last);
 		cur = last;
-		iIdx = l->tqfindRef(cur);
+		iIdx = l->findRef(cur);
 	}
 
 	int y = m_pWndBody->textRect().y() + m_pWndBody->textRect().height();
@@ -786,8 +786,8 @@ void KviNotifierWindow::mouseMoveEvent(TQMouseEvent * e)
 		if(checkResizing(e->pos())) goto sartelo;
 	
 		/* ### MOUSE-MOVE-EVENT -> m_pWndBorder ### */
-		if (m_pWndBorder->captionRect().tqcontains(e->pos())) {
-			if (m_pWndBorder->closeRect().tqcontains(e->pos())) {
+		if (m_pWndBorder->captionRect().contains(e->pos())) {
+			if (m_pWndBorder->closeRect().contains(e->pos())) {
 				m_pWndBorder->setCloseIcon(WDG_ICON_OVER);
 			} else {
 				m_pWndBorder->setCloseIcon(WDG_ICON_OUT);
@@ -798,14 +798,14 @@ void KviNotifierWindow::mouseMoveEvent(TQMouseEvent * e)
 		if(m_pWndTabs->currentTab())
 		{
 			/* ### MOUSE-MOVE-EVENT -> m_pWndTabs ### */ 
-			if (m_pWndTabs->rect().tqcontains(e->pos())) {
+			if (m_pWndTabs->rect().contains(e->pos())) {
 				m_pWndTabs->mouseMoveEvent(e);
 				goto sartelo;
 			}
 		
 			/* ### MOUSE-MOVE-EVENT -> m_pWndBody ### */
-			if (m_pWndBody->rect().tqcontains(e->pos())) {
-				if (m_pWndBody->rctWriteIcon().tqcontains(e->pos())) {
+			if (m_pWndBody->rect().contains(e->pos())) {
+				if (m_pWndBody->rctWriteIcon().contains(e->pos())) {
 					m_pWndBody->setWriteIcon(WDG_ICON_ON);
 				} else {
 					m_pWndBody->setWriteIcon(WDG_ICON_OFF);
@@ -867,15 +867,15 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e)
 
 	if(checkResizing(m_pntClick)) goto sartelo;
 
-	if(m_pWndTabs->rect().tqcontains(e->pos()))
+	if(m_pWndTabs->rect().contains(e->pos()))
 	{
 		m_pWndTabs->mousePressEvent(e);
 		goto sartelo;
 	}
 
-	if(m_pWndBorder->captionRect().tqcontains(e->pos())) {
+	if(m_pWndBorder->captionRect().contains(e->pos())) {
 		//debug ("Clicked on m_pWndBorder->rect()");
-		if(m_pWndBorder->closeRect().tqcontains(e->pos()))	{
+		if(m_pWndBorder->closeRect().contains(e->pos()))	{
 			//debug ("\tClicked on m_pWndBorder->closeRect()");
 			m_bCloseDown = true;
 			m_pWndBorder->setCloseIcon(WDG_ICON_CLICKED);
@@ -892,24 +892,24 @@ void KviNotifierWindow::mousePressEvent(TQMouseEvent * e)
 
 	//debug ("x,y: %d,%d - width,height: %d,%d", m_pWndBorder->rect().x(),m_pWndBorder->rect().y(),m_pWndBorder->rect().width(),m_pWndBorder->rect().height());
 
-	if (m_pWndBorder->rect().tqcontains(e->pos())) {
+	if (m_pWndBorder->rect().contains(e->pos())) {
 		if(m_pWndTabs->currentTab())
 		{
 			//debug ("Clicked on m_pWndBody->textRect()");
-			if(m_pWndBody->rctWriteIcon().tqcontains(e->pos()))
+			if(m_pWndBody->rctWriteIcon().contains(e->pos()))
 			{
 				m_pWndBody->setWriteIcon(WDG_ICON_CLICKED);
 				showLineEdit(!(m_pLineEdit->isVisible()));
 			}	
 			
-			if(m_pWndBody->rctPrevIcon().tqcontains(e->pos()) && m_pWndBody->prevIconState()!=WDG_ICON_OFF)
+			if(m_pWndBody->rctPrevIcon().contains(e->pos()) && m_pWndBody->prevIconState()!=WDG_ICON_OFF)
 			{
 				m_bPrevDown = true;
 				m_pWndBody->setPrevIcon(WDG_ICON_CLICKED);
 				prevButtonClicked();
 			}
 		
-			if(m_pWndBody->rctNextIcon().tqcontains(e->pos()) && m_pWndBody->nextIconState()!=WDG_ICON_OFF)
+			if(m_pWndBody->rctNextIcon().contains(e->pos()) && m_pWndBody->nextIconState()!=WDG_ICON_OFF)
 			{
 				m_bNextDown = true;
 				m_pWndBody->setNextIcon(WDG_ICON_CLICKED);
@@ -947,9 +947,9 @@ void KviNotifierWindow::mouseReleaseEvent(TQMouseEvent * e)
 		return;
 	}
 
-	if(m_pWndBorder->captionRect().tqcontains(e->pos())) {
+	if(m_pWndBorder->captionRect().contains(e->pos())) {
 	
-		if(m_pWndBorder->closeRect().tqcontains(e->pos())) {
+		if(m_pWndBorder->closeRect().contains(e->pos())) {
 			//debug ("hide now from release event");
 			hideNow();
 		} else {
@@ -958,7 +958,7 @@ void KviNotifierWindow::mouseReleaseEvent(TQMouseEvent * e)
 	
 	}
 
-	if(m_pWndTabs->rect().tqcontains(e->pos()))
+	if(m_pWndTabs->rect().contains(e->pos()))
 	{
 		m_pWndTabs->mouseReleaseEvent(e);
 	}
@@ -969,7 +969,7 @@ void KviNotifierWindow::mouseReleaseEvent(TQMouseEvent * e)
 
 void KviNotifierWindow::mouseDoubleClickEvent(TQMouseEvent * e)
 {
-	if(!m_pWndBody->textRect().tqcontains(e->pos()))
+	if(!m_pWndBody->textRect().contains(e->pos()))
 	{
 		TQWidget::mouseDoubleClickEvent(e);
 		return;
@@ -1406,8 +1406,8 @@ void KviNotifierWindow::returnPressed()
 	TQString txt = m_pLineEdit->text();
 	if(txt.isEmpty())return;
 	TQString html = txt;
-	html.tqreplace("<","&lt;");
-	html.tqreplace(">","&gt;");
+	html.replace("<","&lt;");
+	html.replace(">","&gt;");
 	KviStr tmp(KviStr::Format,"%d",KVI_SMALLICON_OWNPRIVMSG);
 
 	addMessage(tab->window(),tmp.ptr(),html,0); //m_pCurrentFocusedWindowTab on place of m_pCurrentMessage->window()
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index 7455049f..9e024d5b 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -77,7 +77,7 @@ KviNotifierWindowTab::~KviNotifierWindowTab()
 void KviNotifierWindowTab::setNextMessageAsCurrent()
 {
 	if(!m_pCurrentMessage)return;
-	if(m_pMessageList->tqfindRef(m_pCurrentMessage) == -1)return;
+	if(m_pMessageList->findRef(m_pCurrentMessage) == -1)return;
 	m_pCurrentMessage = m_pMessageList->next();
 	if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->last();
 }
@@ -85,7 +85,7 @@ void KviNotifierWindowTab::setNextMessageAsCurrent()
 void KviNotifierWindowTab::setPrevMessageAsCurrent()
 {
 	if(!m_pCurrentMessage)return;
-	if(!m_pMessageList->tqfindRef(m_pCurrentMessage) == -1)return;
+	if(!m_pMessageList->findRef(m_pCurrentMessage) == -1)return;
 	m_pCurrentMessage = m_pMessageList->prev();
 	if(!m_pCurrentMessage)m_pCurrentMessage = m_pMessageList->first();
 }
@@ -285,7 +285,7 @@ void KviNotifierWindowTabs::addMessage(KviWindow * pWnd, KviNotifierMessage * me
 	// e quindi iterando i tab nuovi possono trovarsi PRIMA dei tab vecchi
 	// il che' confonde un po
 	KviNotifierWindowTab * tab;
-	if (!m_tabMap.tqcontains(pWnd)) {
+	if (!m_tabMap.contains(pWnd)) {
 		m_tabMap.insert(pWnd, tab = new KviNotifierWindowTab(pWnd, sender));
 		m_tabPtrList.append(tab);
 	} else {
@@ -413,26 +413,26 @@ void KviNotifierWindowTabs::next()
 
 void KviNotifierWindowTabs::mousePressEvent(TQMouseEvent * e) {
 
-	if (m_bIsOverRightBound && m_rctNextIcon.tqcontains(e->pos())) {
+	if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) {
 		return;
 	}
 	
-	if (m_bIsOverLeftBound && m_rctPrevIcon.tqcontains(e->pos())) {
+	if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) {
 		return;
 	}
 
-	if(m_rctTabs.tqcontains(e->pos()))
+	if(m_rctTabs.contains(e->pos()))
 	{
 		TQMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab;
 		for (tab = m_tabMap.begin(); tab != m_tabMap.end(); tab++ ) {
-			if (tab.data()->rect().tqcontains(e->pos())) {
+			if (tab.data()->rect().contains(e->pos())) {
 				setFocusOn(tab.data());
 				return;
 			}
 		}
 	}
 
-	if (m_rctCloseTabIconHotArea.tqcontains(e->pos())) {
+	if (m_rctCloseTabIconHotArea.contains(e->pos())) {
 		setCloseTabIcon(WDG_ICON_CLICKED);
 		return;
 	}
@@ -441,7 +441,7 @@ void KviNotifierWindowTabs::mousePressEvent(TQMouseEvent * e) {
 
 void KviNotifierWindowTabs::mouseMoveEvent(TQMouseEvent * e)
 {
-	if (m_rctCloseTabIconHotArea.tqcontains(e->pos()))
+	if (m_rctCloseTabIconHotArea.contains(e->pos()))
 	{
 		setCloseTabIcon(WDG_ICON_ON);
 	} else {
@@ -453,19 +453,19 @@ void KviNotifierWindowTabs::mouseMoveEvent(TQMouseEvent * e)
 void KviNotifierWindowTabs::mouseReleaseEvent(TQMouseEvent * e)
 {
 
-	if (m_bIsOverRightBound && m_rctNextIcon.tqcontains(e->pos())) {
+	if (m_bIsOverRightBound && m_rctNextIcon.contains(e->pos())) {
 		scrollTabsLeft();
 		return;
 	}
 	
-	if (m_bIsOverLeftBound && m_rctPrevIcon.tqcontains(e->pos())) {
+	if (m_bIsOverLeftBound && m_rctPrevIcon.contains(e->pos())) {
 		scrollTabsRight();
 		return;
 	}
 
 	if(currentTab())
 	{
-		if (rctCloseTabIconHotArea().tqcontains(e->pos()))
+		if (rctCloseTabIconHotArea().contains(e->pos()))
 		{
 			closeCurrentTab();
 			g_pNotifierWindow->update();
@@ -555,7 +555,7 @@ void KviNotifierWindowTabs::draw(TQPainter * p)
 
 	KviPointerListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 	
-	//m_tabPtrList.tqfindRef(m_tabMap[m_pTabFocused->wnd()]);
+	//m_tabPtrList.findRef(m_tabMap[m_pTabFocused->wnd()]);
 
 //	TQMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab;
 	KviNotifierWindowTab * tab;
@@ -654,7 +654,7 @@ void KviNotifierWindowTabs::markAllMessagesAsHistoric()
 
 void KviNotifierWindowTabs::closeTab(KviWindow * pWnd)
 {
-	KviNotifierWindowTab * pTab = m_tabMap.tqfind(pWnd).data();
+	KviNotifierWindowTab * pTab = m_tabMap.find(pWnd).data();
 	closeTab(pWnd, pTab);
 }
 
@@ -671,7 +671,7 @@ void KviNotifierWindowTabs::closeCurrentTab()
 	KviNotifierWindowTab * pTab = m_pTabFocused;
 	if (m_tabMap.isEmpty()) return; // Empty??? The World is ending...
 	KviWindow * pWnd = pTab->wnd();
-	if (!m_tabMap.tqcontains(pWnd)) return; // The current tab is not on the map??? Call 911!!
+	if (!m_tabMap.contains(pWnd)) return; // The current tab is not on the map??? Call 911!!
 	// End paranoic stuff, go back to sanity...
 	
 	closeTab(pWnd, pTab);
diff --git a/src/modules/objects/class_dockwindow.cpp b/src/modules/objects/class_dockwindow.cpp
index 35d9c070..aa9c8f88 100644
--- a/src/modules/objects/class_dockwindow.cpp
+++ b/src/modules/objects/class_dockwindow.cpp
@@ -217,25 +217,25 @@ bool KviKvsObject_dockwindow::function_setAllowedDockAreas(KviKvsObjectFunctionC
 
 #ifdef COMPILE_USE_QT4
 	TQt::DockWidgetAreas fAreas = TQt::NoDockWidgetArea;
-	if(szFlags.tqfind('t',false))fAreas |= TQt::TopDockWidgetArea;
-	if(szFlags.tqfind('l',false))fAreas |= TQt::LeftDockWidgetArea;
-	if(szFlags.tqfind('r',false))fAreas |= TQt::RightDockWidgetArea;
-	if(szFlags.tqfind('b',false))fAreas |= TQt::BottomDockWidgetArea;
+	if(szFlags.find('t',false))fAreas |= TQt::TopDockWidgetArea;
+	if(szFlags.find('l',false))fAreas |= TQt::LeftDockWidgetArea;
+	if(szFlags.find('r',false))fAreas |= TQt::RightDockWidgetArea;
+	if(szFlags.find('b',false))fAreas |= TQt::BottomDockWidgetArea;
 	_pDockWindow->setAllowedAreas(fAreas);
 	TQDockWidget::DockWidgetFeatures fFeatures = _pDockWindow->features();
-	if(szFlags.tqfind('f',false))
+	if(szFlags.find('f',false))
 		fFeatures |= TQDockWidget::DockWidgetFloatable;
 	else
 		fFeatures &= ~TQDockWidget::DockWidgetFloatable;
 	// no support for minimized dock widgets
 	_pDockWindow->setFeatures(fFeatures);
 #else //!COMPILE_USE_QT4
-	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTop,szFlags.tqfind('t',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockLeft,szFlags.tqfind('l',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockRight,szFlags.tqfind('r',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockBottom,szFlags.tqfind('b',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTornOff,szFlags.tqfind('f',false) != -1);
-	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockMinimized,szFlags.tqfind('m',false) != -1);
+	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTop,szFlags.find('t',false) != -1);
+	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockLeft,szFlags.find('l',false) != -1);
+	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockRight,szFlags.find('r',false) != -1);
+	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockBottom,szFlags.find('b',false) != -1);
+	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockTornOff,szFlags.find('f',false) != -1);
+	g_pFrame->setDockEnabled(_pDockWindow,TQt::DockMinimized,szFlags.find('m',false) != -1);
 #endif //!COMPILE_USE_QT4
 
 	return true;
@@ -252,22 +252,22 @@ bool KviKvsObject_dockwindow::function_dock(KviKvsObjectFunctionCall * c)
 	if(!widget())return true; // hum ? dead ?
 #ifdef COMPILE_USE_QT4
 	g_pFrame->removeDockWidget(_pDockWindow);
-	if(szDock.tqfind('m',false) == -1)_pDockWindow->setFloating(false);
-	if(szDock.tqfind('t',false) != -1)g_pFrame->addDockWidget(TQt::TopDockWidgetArea,_pDockWindow);
-	else if(szDock.tqfind('l',false) != -1)g_pFrame->addDockWidget(TQt::LeftDockWidgetArea,_pDockWindow);
-	else if(szDock.tqfind('r',false) != -1)g_pFrame->addDockWidget(TQt::RightDockWidgetArea,_pDockWindow);
-	else if(szDock.tqfind('b',false) != -1)g_pFrame->addDockWidget(TQt::BottomDockWidgetArea,_pDockWindow);
-	else if(szDock.tqfind('f',false) != -1)_pDockWindow->setFloating(true);
-	else if(szDock.tqfind('m',false) != -1)qDebug("Sorry: no support for minimized dock widgets in TQt4");
+	if(szDock.find('m',false) == -1)_pDockWindow->setFloating(false);
+	if(szDock.find('t',false) != -1)g_pFrame->addDockWidget(TQt::TopDockWidgetArea,_pDockWindow);
+	else if(szDock.find('l',false) != -1)g_pFrame->addDockWidget(TQt::LeftDockWidgetArea,_pDockWindow);
+	else if(szDock.find('r',false) != -1)g_pFrame->addDockWidget(TQt::RightDockWidgetArea,_pDockWindow);
+	else if(szDock.find('b',false) != -1)g_pFrame->addDockWidget(TQt::BottomDockWidgetArea,_pDockWindow);
+	else if(szDock.find('f',false) != -1)_pDockWindow->setFloating(true);
+	else if(szDock.find('m',false) != -1)qDebug("Sorry: no support for minimized dock widgets in TQt4");
 	else c->warning(__tr2qs("Invalid dock area specified"));
 	
 #else //!COMPILE_USE_QT4
-	if(szDock.tqfind('t',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTop,false,100);
-	else if(szDock.tqfind('l',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockLeft,false,100);
-	else if(szDock.tqfind('r',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockRight,false,100);
-	else if(szDock.tqfind('b',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockBottom,false,100);
-	else if(szDock.tqfind('f',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTornOff,false,100);
-	else if(szDock.tqfind('m',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockMinimized,false,100);
+	if(szDock.find('t',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTop,false,100);
+	else if(szDock.find('l',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockLeft,false,100);
+	else if(szDock.find('r',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockRight,false,100);
+	else if(szDock.find('b',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockBottom,false,100);
+	else if(szDock.find('f',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockTornOff,false,100);
+	else if(szDock.find('m',false) != -1)g_pFrame->moveDockWindow(_pDockWindow,TQt::DockMinimized,false,100);
 	else c->warning(__tr2qs("Invalid dock area specified"));
 #endif //!COMPILE_USE_QT4
 	return true;
diff --git a/src/modules/objects/class_label.cpp b/src/modules/objects/class_label.cpp
index 20184b9c..1a23aa4c 100644
--- a/src/modules/objects/class_label.cpp
+++ b/src/modules/objects/class_label.cpp
@@ -142,7 +142,7 @@ const int frame_cod[] = {
 		Sets auto-resize ability to enabled (if <benabled> is 1) or disabled
 		 (if <benabled> is 0). If auto-resize is enabled, the label will 
 		automagically resize itself accordingly to the 'size' of the
-		text it tqcontains. 
+		text it contains. 
 		See also [classfnc]$autoResize[/classfnc]().
 		!fn: <string> $tqalignment()
 		Returns a string containing tqalignment flags that are set for 
diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 4ce0b92a..5b9103b3 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -218,7 +218,7 @@ void KviScriptSocketObject::reset()
 		the incoming connection will be automatically terminated.
 
 		!fn: $connectFailedEvent(<reason>)
-		This function is called when a connection attempt fails for some reason. <reason> tqcontains
+		This function is called when a connection attempt fails for some reason. <reason> contains
 		the error string.[br]
 		This function may be called only between a call to [classfnc:socket]$connect[/classfnc]() and
 		the [classfnc:socket]$connectEvent[/classfnc]().
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 87d2e0c4..ca1333f9 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -132,7 +132,7 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		pParams->at(i)->asString(s);
 		if (!s.isEmpty())
 		{
-		int idx = s.tqfind("::");
+		int idx = s.find("::");
 		if( idx != -1 ) {
 			szClass = s.left(idx);
 			szName  = s.right(s.length() - idx - 2);
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 81d3bef1..b91af107 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -209,7 +209,7 @@ static bool objects_kvs_cmd_clearObjects(KviKvsModuleCommandCall * c)
 	*/
 
 	KviKvsKernel::instance()->objectController()->clearInstances();
-	if(!c->switches()->tqfind('i',"ii")) KviKvsKernel::instance()->objectController()->clearUserClasses();
+	if(!c->switches()->find('i',"ii")) KviKvsKernel::instance()->objectController()->clearUserClasses();
 	return true;
 }
 
@@ -345,7 +345,7 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
 	KviKvsObjectClass * pClass = KviKvsKernel::instance()->objectController()->lookupClass(szClassName);
 	if(!pClass)
 	{
-		if(!szFlags.tqcontains(TQChar('q')))
+		if(!szFlags.contains(TQChar('q')))
 			c->warning(__tr2qs("The class '%Q' does not exist"),&szClassName);
 		return true;
 	}
@@ -353,7 +353,7 @@ static bool objects_kvs_fnc_instances(KviKvsModuleFunctionCall * c)
 
 	KviPointerHashTableIterator<void *,KviKvsObject> it(*od);
 	kvs_uint_t uIdx = 0;
-	if(szFlags.tqcontains(TQChar('s')))
+	if(szFlags.contains(TQChar('s')))
 	{
 		while(KviKvsObject * ob = it.current())
 		{
@@ -498,7 +498,7 @@ static bool objects_kvs_fnc_classes(KviKvsModuleFunctionCall * c)
 	for(TQStringList::Iterator it2 = sl.begin();it2 != sl.end();++it2)
 	{
 		TQString szName=*it2;
-		szName.tqreplace("--","::");		
+		szName.replace("--","::");		
 		if (szName!=".." && szName!=".") classdict->insert(szName.left(szName.length()-4),&bFake);	
 	}
 	KviKvsArray* pArray = new KviKvsArray();
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 10117d27..4f53ad13 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -356,9 +356,9 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 				for(int j=0;j<lKeywords.count();j++)
 				{
 #ifdef COMPILE_USE_QT4
-					if(szText.tqfind(lKeywords.at(j),0,false) == -1)
+					if(szText.find(lKeywords.at(j),0,false) == -1)
 #else
-					if(szText.tqfind(*(lKeywords.at(j)),0,false) == -1)
+					if(szText.find(*(lKeywords.at(j)),0,false) == -1)
 #endif
 					{
 						bOk = false;
@@ -398,7 +398,7 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 						{
 							if(pParent->inherits("KviOptionsWidget"))
 							{
-								bool * pExistingBool = lOptionWidgetsToMark.tqfind(pParent);
+								bool * pExistingBool = lOptionWidgetsToMark.find(pParent);
 								if(pExistingBool)
 								{
 									if(bOk)
@@ -432,8 +432,8 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const TQSt
 			TQString szTxt = pTabWidgetToMark->tabLabel(pOptionsWidget);
 			if(KviTQString::equalCIN(szTxt,">>> ",4))
 			{
-				szTxt.tqreplace(">>> ","");
-				szTxt.tqreplace(" <<<","");
+				szTxt.replace(">>> ","");
+				szTxt.replace(" <<<","");
 			}
 			if(*pBool)
 			{
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 38593666..eeb2d8a0 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -98,7 +98,7 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
 	KVSM_PARAMETERS_END(c)
 	if(szGroup.isEmpty())szGroup = "general";
-	KviOptionsDialog * d = g_pOptionsDialogDict->tqfind(szGroup);
+	KviOptionsDialog * d = g_pOptionsDialogDict->find(szGroup);
 	if(d)
 	{
 		if(c->hasSwitch('t',"toplevel"))
@@ -264,7 +264,7 @@ static bool options_kvs_fnc_isdialog(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("options_group",KVS_PT_STRING,KVS_PF_OPTIONAL,szGroup)
 	KVSM_PARAMETERS_END(c)
 	if(szGroup.isEmpty())szGroup = "general";
-	c->returnValue()->setBoolean(g_pOptionsDialogDict->tqfind(szGroup));
+	c->returnValue()->setBoolean(g_pOptionsDialogDict->find(szGroup));
 	return true;
 }
 
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 4c892102..0f702ae3 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -620,13 +620,13 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 		{
 			// local path, loaded
 			TQString tmp = szCurrent;
-			int idx = tmp.tqfindRev("/");
+			int idx = tmp.findRev("/");
 			if(idx != -1)
 			{
 				szCurrent = tmp.right(tmp.length() - (idx + 1));
 				tmp = szCurrent;
 			}
-			idx = tmp.tqfindRev("\\");
+			idx = tmp.findRev("\\");
 			if(idx != -1)
 			{
 				szCurrent = tmp.right(tmp.length() - (idx + 1));
@@ -672,9 +672,9 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(TQWidget * tq
 	m_pSSelector=0;
 
 	m_sModeStr = KVI_OPTION_STRING(KviOption_stringDefaultUserMode);
-	m_bI = m_sModeStr.tqcontains('i');
-	m_bW = m_sModeStr.tqcontains('w');
-	m_bS = m_sModeStr.tqcontains('s');
+	m_bI = m_sModeStr.contains('i');
+	m_bW = m_sModeStr.contains('w');
+	m_bS = m_sModeStr.contains('s');
     
 
 	createLayout(2,1);
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index 92d17036..c4afaca8 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -170,7 +170,7 @@ bool KviNickServRuleEditor::validate()
 		return false;
 	}
 	
-	if(s.tqfind(TQChar(' ')) != -1)
+	if(s.find(TQChar(' ')) != -1)
 	{
 		TQMessageBox::warning(this,m,__tr2qs_ctx("The Nickname field can't contain spaces!","options"),o);
 		return false;
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 9410d174..258601f4 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -529,15 +529,15 @@ KviServerDetailsWidget::KviServerDetailsWidget(TQWidget * par,KviIrcServer * s)
 	
 	m_pIMode = new KviStyledCheckBox(__tr2qs_ctx("Invisible (+i)","options"),gbox);
 	m_pIMode->setEnabled(bHasUmode);
-	m_pIMode->setChecked(bHasUmode ? s->initUMode().tqcontains('i',false) : szDefUMode.tqcontains('i',false));
+	m_pIMode->setChecked(bHasUmode ? s->initUMode().contains('i',false) : szDefUMode.contains('i',false));
 	
 	m_pSMode = new KviStyledCheckBox(__tr2qs_ctx("Server notices (+s)","options"),gbox);
 	m_pSMode->setEnabled(bHasUmode);
-	m_pSMode->setChecked(bHasUmode ? s->initUMode().tqcontains('s',false) : szDefUMode.tqcontains('s',false));
+	m_pSMode->setChecked(bHasUmode ? s->initUMode().contains('s',false) : szDefUMode.contains('s',false));
 	
 	m_pWMode = new KviStyledCheckBox(__tr2qs_ctx("Wallops (+w)","options"),gbox);
 	m_pWMode->setEnabled(bHasUmode);
-	m_pWMode->setChecked(bHasUmode ? s->initUMode().tqcontains('w',false) : szDefUMode.tqcontains('w',false));
+	m_pWMode->setChecked(bHasUmode ? s->initUMode().contains('w',false) : szDefUMode.contains('w',false));
 
 	l = new TQLabel("",tab);
 	gl->addWidget(l,2,0);
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index 1b44f803..aad9f2f3 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -89,8 +89,8 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(TQWidget * tqparent)
 	
 	for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
 		TQString szTmp=*it;
-		szTmp.tqreplace("kvirc_","");
-		szTmp.tqreplace(".mo","");
+		szTmp.replace("kvirc_","");
+		szTmp.replace(".mo","");
 		m_pForcedLocaleCombo->insertItem(szTmp);
 		if(KviTQString::equalCI(szTmp,m_szLanguage))
 			iMatch = i + 2;
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index efe00321..8695406d 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -88,37 +88,37 @@ void KviUrlHandlersOptionsWidget::commit()
 	KviOptionsWidget::commit();
 
 #ifdef COMPILE_ON_WINDOWS
-	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("@MAGIC@","\\\\","options");
 
-	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\\\","@MAGIC@","options");
-	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\","\\\\","options");
-	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("@MAGIC@","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\","@MAGIC@","options");
+	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\","\\\\","options");
+	KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("@MAGIC@","\\\\","options");
 	
 	//Check for escaped " in url handler ( \" )
-        KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).tqreplace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).tqreplace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).tqreplace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).tqreplace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlFileCommand).tqreplace("\\\\\"","\\\"","options");
-        KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).tqreplace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlHttpCommand).replace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlHttpsCommand).replace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlFtpCommand).replace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand).replace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlFileCommand).replace("\\\\\"","\\\"","options");
+        KVI_OPTION_STRING(KviOption_stringUrlUnknownCommand).replace("\\\\\"","\\\"","options");
 #endif
 }
 
diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp
index 3362586c..fef9644c 100644
--- a/src/modules/perl/libkviperl.cpp
+++ b/src/modules/perl/libkviperl.cpp
@@ -43,7 +43,7 @@
 		g_pPerlCoreModule = g_pModuleManager->getModule("perlcore"); \
 		if(!g_pPerlCoreModule) \
 		{ \
-			if(!_c->switches()->tqfind('q',"quiet")) \
+			if(!_c->switches()->find('q',"quiet")) \
 			{ \
 				_c->warning(__tr2qs_ctx("The perlcore module can't be loaded: perl support not available","perl")); \
 				_c->warning(__tr2qs_ctx("To see more details about loading failure try /perlcore.load","perl")); \
@@ -58,7 +58,7 @@
 	#define KVS_CHECK_MODULE_STATE(_m,_c) KVS_CHECK_PERLCORE(_m,_c)
 #else // !COMPILE_PERL_SUPPORT
 	#define KVS_CHECK_MODULE_STATE(_m,_c) \
-		if(!_c->switches()->tqfind('q',"quiet")) \
+		if(!_c->switches()->find('q',"quiet")) \
 			_c->warning(__tr2qs_ctx("This KVIrc executable has been compiled without perl scripting support","perl")); \
 		return true;
 #endif // !COMPILE_PERL_SUPPORT
@@ -454,11 +454,11 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 		v->asString(tmp);
 		ex.lArgs.append(tmp);
 	}
-	ex.bQuiet = c->switches()->tqfind('q',"quiet");
+	ex.bQuiet = c->switches()->find('q',"quiet");
 	
 	if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_EXECUTE,&ex))
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the perl support","perl"));
 		return true;
 	}
@@ -471,10 +471,10 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 
 	if(!ex.bExitOk)
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 		{
 			
-			if(c->switches()->tqfind('f',"fail-on-error"))
+			if(c->switches()->find('f',"fail-on-error"))
 			{
 				c->warning(__tr2qs_ctx("Perl execution error:","perl"));
 				c->warning(ex.szError);
@@ -486,7 +486,7 @@ static bool perl_kvs_cmd_begin(KviKvsModuleCommandCall * c)
 		}
 	}
 
-	if(!c->switches()->tqfind('n',"no-return"))
+	if(!c->switches()->find('n',"no-return"))
 		c->context()->returnValue()->setString(ex.szRetVal);
 
 #endif //COMPILE_PERL_SUPPORT
@@ -532,7 +532,7 @@ static bool perl_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 	
 	if(!g_pPerlCoreModule->ctrl(KVI_PERLCORECTRLCOMMAND_DESTROY,&ex))
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs_ctx("The perlcore module failed to execute the code: something is wrong with the perl support","perl"));
 	}
 #endif //COMPILE_PERL_SUPPORT
diff --git a/src/modules/perlcore/KVIrc.xs b/src/modules/perlcore/KVIrc.xs
index 72ee5fd3..017350c5 100644
--- a/src/modules/perlcore/KVIrc.xs
+++ b/src/modules/perlcore/KVIrc.xs
@@ -56,7 +56,7 @@ char * getLocal(varname)
 		KviStr hack;
 		if(g_pCurrentKvsContext)
 		{
-			KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->tqfind(varname);
+			KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(varname);
 			if(pVar)
 			{
 				pVar->asString(tmp);
@@ -89,7 +89,7 @@ char * getGlobal(varname)
 		KviStr hack;
 		if(g_pCurrentKvsContext)
 		{
-			KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->tqfind(varname);
+			KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->find(varname);
 			if(pVar)
 			{
 				pVar->asString(tmp);
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 4325ccda..a7c9a282 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -299,7 +299,7 @@ static KviPointerHashTable<TQString,KviPerlInterpreter> * g_pInterpreters = 0;
 
 static KviPerlInterpreter * perlcore_get_interpreter(const TQString &szContextName)
 {
-	KviPerlInterpreter * i = g_pInterpreters->tqfind(szContextName);
+	KviPerlInterpreter * i = g_pInterpreters->find(szContextName);
 	if(i)return i;
 	i = new KviPerlInterpreter(szContextName);
 	if(!i->init())
@@ -307,13 +307,13 @@ static KviPerlInterpreter * perlcore_get_interpreter(const TQString &szContextNa
 		delete i;
 		return 0;
 	}
-	g_pInterpreters->tqreplace(szContextName,i);
+	g_pInterpreters->replace(szContextName,i);
 	return i;
 }
 
 static void perlcore_destroy_interpreter(const TQString &szContextName)
 {
-	KviPerlInterpreter * i = g_pInterpreters->tqfind(szContextName);
+	KviPerlInterpreter * i = g_pInterpreters->find(szContextName);
 	if(!i)return;
 	g_pInterpreters->remove(szContextName);
 	i->done();
diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h
index 86d03bce..2a802132 100644
--- a/src/modules/perlcore/ppport.h
+++ b/src/modules/perlcore/ppport.h
@@ -81,11 +81,11 @@
 /*
 #!/usr/bin/perl
 @ARGV = ("*.xs") if !@ARGV;
-%badmacros = %funcs = %macros = (); $tqreplace = 0;
+%badmacros = %funcs = %macros = (); $replace = 0;
 foreach (<DATA>) {
 	$funcs{$1} = 1 if /Provide:\s+(\S+)/;
 	$macros{$1} = 1 if /^#\s*define\s+([a-zA-Z0-9_]+)/;
-	$tqreplace = $1 if /Replace:\s+(\d+)/;
+	$replace = $1 if /Replace:\s+(\d+)/;
 	$badmacros{$2}=$1 if $replace and /^#\s*define\s+([a-zA-Z0-9_]+).*?\s+([a-zA-Z0-9_]+)/;
 	$badmacros{$1}=$2 if /Replace (\S+) with (\S+)/;
 }
@@ -404,7 +404,7 @@ SV *sv;
  *
  * Code that uses these macros is responsible for the following:
  * 1. #define MY_CXT_KEY to a unique string, e.g. "DynaLoader_guts"
- * 2. Declare a typedef named my_cxt_t that is a structure that tqcontains
+ * 2. Declare a typedef named my_cxt_t that is a structure that contains
  *    all the data that needs to be interpreter-local.
  * 3. Use the START_MY_CXT macro after the declaration of my_cxt_t.
  * 4. Use the MY_CXT_INIT macro such that it is called exactly once
diff --git a/src/modules/perlcore/xs.inc b/src/modules/perlcore/xs.inc
index 092e9369..a0741207 100644
--- a/src/modules/perlcore/xs.inc
+++ b/src/modules/perlcore/xs.inc
@@ -129,7 +129,7 @@ XS(XS_KVIrc_getLocal)
 		KviStr hack;
 		if(g_pCurrentKvsContext)
 		{
-			KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->tqfind(varname);
+			KviKvsVariant * pVar = g_pCurrentKvsContext->localVariables()->find(varname);
 			if(pVar)
 			{
 				pVar->asString(tmp);
@@ -183,7 +183,7 @@ XS(XS_KVIrc_getGlobal)
 		KviStr hack;
 		if(g_pCurrentKvsContext)
 		{
-			KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->tqfind(varname);
+			KviKvsVariant * pVar = g_pCurrentKvsContext->globalVariables()->find(varname);
 			if(pVar)
 			{
 				pVar->asString(tmp);
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index 51fb91d1..cc00fecd 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -113,7 +113,7 @@ static bool regchan_kvs_cmd_remove(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 	KviRegisteredChannel * ch;
 	if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan,szNetwork);
-	else ch = g_pRegisteredChannelDataBase->tqfind(szChan,szNetwork);
+	else ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
 	if(ch)
 	{
 		g_pRegisteredChannelDataBase->remove(ch);
@@ -165,7 +165,7 @@ static bool regchan_kvs_cmd_setProperty(KviKvsModuleCommandCall * c)
 	KVSM_PARAMETERS_END(c)
 	KviRegisteredChannel * ch;
 	if(c->hasSwitch('e',"exactly"))ch = g_pRegisteredChannelDataBase->findExact(szChan,szNetwork);
-	else ch = g_pRegisteredChannelDataBase->tqfind(szChan,szNetwork);
+	else ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
 	if(ch)
 	{
 		if(!szValue.isEmpty())
@@ -311,7 +311,7 @@ static bool regchan_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("network",KVS_PT_STRING,0,szNetwork)
 		KVSM_PARAMETER("property name",KVS_PT_NONEMPTYSTRING,0,szPropertyName)
 	KVSM_PARAMETERS_END(c)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->tqfind(szChan,szNetwork);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
 	if(ch)
 	{
 		KviStr * p = ch->property(szPropertyName);
@@ -338,7 +338,7 @@ static bool regchan_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 			echo $regchan.match(#kvirc,$my.network)
 		[/example]
 	@seealso:
-		[fnc]$regchan.tqfind[/fnc]
+		[fnc]$regchan.find[/fnc]
 */
 
 
@@ -349,21 +349,21 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
 		KVSM_PARAMETER("network",KVS_PT_STRING,0,szNetwork)
 	KVSM_PARAMETERS_END(c)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->tqfind(szChan,szNetwork);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNetwork);
 	c->returnValue()->setBoolean(ch);
 	return true;
 }
 
 /*
-	@doc: regchan.tqfind
+	@doc: regchan.find
 	@type:
 		function
 	@title:
-		$regchan.tqfind
+		$regchan.find
 	@short:
 		Checks if a channel is registered
 	@syntax:
-		<boolean> $regchan.tqfind(<channel_name:string>,<nettqmask:string>)
+		<boolean> $regchan.find(<channel_name:string>,<nettqmask:string>)
 	@description:
 		Returns 1 if the channel identified by <channel_name> and <nettqmask>
 		is registered and 0 otherwise. This function is similar to $regchan.match
@@ -371,21 +371,21 @@ static bool regchan_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 		of the registered channel entry.
 	@examples:
 		[example]
-			echo $regchan.tqfind(#kvirc,IRCNet)
-			echo $regchan.tqfind(#kvirc,*)
+			echo $regchan.find(#kvirc,IRCNet)
+			echo $regchan.find(#kvirc,*)
 		[/example]
 	@seealso:
 		[fnc]$regchan.match[/fnc]
 */
 
-static bool regchan_kvs_fnc_tqfind(KviKvsModuleFunctionCall * c)
+static bool regchan_kvs_fnc_find(KviKvsModuleFunctionCall * c)
 { 
 	TQString szChan,szNettqmask;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("channel name",KVS_PT_STRING,0,szChan)
 		KVSM_PARAMETER("nettqmask",KVS_PT_STRING,0,szNettqmask)
 	KVSM_PARAMETERS_END(c)
-	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->tqfind(szChan,szNettqmask);
+	KviRegisteredChannel * ch = g_pRegisteredChannelDataBase->find(szChan,szNettqmask);
 	c->returnValue()->setBoolean(ch);
 	return true;
 }
@@ -398,7 +398,7 @@ static bool regchan_module_init(KviModule * m)
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"setProperty",regchan_kvs_cmd_setProperty);
 	KVSM_REGISTER_FUNCTION(m,"property",regchan_kvs_fnc_property);
 	KVSM_REGISTER_FUNCTION(m,"match",regchan_kvs_fnc_match);
-	KVSM_REGISTER_FUNCTION(m,"tqfind",regchan_kvs_fnc_tqfind);
+	KVSM_REGISTER_FUNCTION(m,"find",regchan_kvs_fnc_find);
 	KVSM_REGISTER_FUNCTION(m,"list",regchan_kvs_fnc_list);
 	
 	return true;
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 1f816ed4..c6a5f70a 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -347,7 +347,7 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
 				for(KviIrcMask * m = i->user()->maskList()->first();m;m = i->user()->maskList()->next())
 				{
 					TQString tmp = m->nick();
-					if((tmp.tqfind('*') == -1) && (tmp.tqfind('?') == -1) && (!tmp.isEmpty()))
+					if((tmp.find('*') == -1) && (tmp.find('?') == -1) && (!tmp.isEmpty()))
 					{
 						if(!szMask.isEmpty())szMask.append(' ');
 						szMask.append(tmp);
@@ -355,10 +355,10 @@ void KviRegisteredUsersDialog::itemPressed(KviTalListViewItem *it,const TQPoint
 				}
 				// if the nickname list is still empty , build a dummy nick to notify
 				szMask = i->user()->name();
-				szMask.tqreplace(" ","");
-				szMask.tqreplace("'","");
-				szMask.tqreplace("&","");
-				szMask.tqreplace(",","");
+				szMask.replace(" ","");
+				szMask.replace("'","");
+				szMask.replace("&","");
+				szMask.replace(",","");
 	
 				i->user()->setProperty("notify",szMask);
 			}
@@ -433,7 +433,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem *
 			for(KviPointerHashTableEntry<TQString,KviRegisteredUserGroup> * g = pGroups->firstEntry();g;g = pGroups->nextEntry())
 			{
 				int id=groups->insertItem(g->key());
-				m_TmpDict.tqreplace(id,g->data());
+				m_TmpDict.replace(id,g->data());
 			}
 			
 			connect(groups,TQT_SIGNAL(activated ( int )),this,TQT_SLOT(moveToGroupMenuClicked(int)));
@@ -447,7 +447,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( KviTalListViewItem *
 
 void KviRegisteredUsersDialog::moveToGroupMenuClicked(int id)
 {
-	TQString szGroup=m_TmpDict.tqfind(id)->name();
+	TQString szGroup=m_TmpDict.find(id)->name();
 	KviTalListViewItemIterator it( m_pListView,  KviTalListViewItemIterator::Selected );
 	while ( it.current() ) {
 		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(it.current());
@@ -481,10 +481,10 @@ void KviRegisteredUsersDialog::fillList()
 	{
 		if(u->group().isEmpty())
 			u->setGroup(__tr("Default"));
-		if(groupItems.tqfind(u->group()))
-			item = new KviRegisteredUsersDialogItem(groupItems.tqfind(u->group()),u);
-		else if(groupItems.tqfind(__tr("Default")))
-			item = new KviRegisteredUsersDialogItem(groupItems.tqfind(__tr("Default")),u);
+		if(groupItems.find(u->group()))
+			item = new KviRegisteredUsersDialogItem(groupItems.find(u->group()),u);
+		else if(groupItems.find(__tr("Default")))
+			item = new KviRegisteredUsersDialogItem(groupItems.find(__tr("Default")),u);
 		else { //should never be called
 			KviRegisteredUserGroup* pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr("Default"));
 			KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,pGroup);
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 97019154..66e89d18 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -171,7 +171,7 @@ void KviReguserPropertiesDialog::okClicked()
 		TQString szValue = m_pTable->text(i,1);
 		if((!szName.isEmpty()) && (!szValue.isEmpty()))
 		{
-			m_pPropertyDict->tqreplace(szName,new TQString(szValue));
+			m_pPropertyDict->replace(szName,new TQString(szValue));
 		}
 	}
 
@@ -725,7 +725,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	} else {
 		KviStr szPath = m_pAvatar->path();
 		if(szPath.isEmpty())m_pPropertyDict->remove("avatar");
-		else m_pPropertyDict->tqreplace("avatar",new TQString(szPath));
+		else m_pPropertyDict->replace("avatar",new TQString(szPath));
 	}
 
 	if(m_pNotifyCheck->isChecked())
@@ -734,7 +734,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	
 		if(!szNicks.isEmpty())
 		{
-			m_pPropertyDict->tqreplace("notify",new TQString(szNicks));
+			m_pPropertyDict->replace("notify",new TQString(szNicks));
 		} else {
 			m_pPropertyDict->remove("notify");
 		}
@@ -751,7 +751,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	}
 	delete dlg;
 
-	TQString * notify = m_pPropertyDict->tqfind("notify");
+	TQString * notify = m_pPropertyDict->find("notify");
 	bool bGotIt = false;
 	if(notify)
 	{
@@ -765,7 +765,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	m_pNotifyNick->setEnabled(bGotIt);
 	if(!bGotIt)m_pNotifyNick->setText("");
 
-	TQString * avatar = m_pPropertyDict->tqfind("avatar");
+	TQString * avatar = m_pPropertyDict->find("avatar");
 	bGotIt = false;
 	if(avatar)
 	{
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 86bac9f7..6b8f7155 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -190,7 +190,7 @@ static bool reguser_kvs_cmd_add(KviKvsModuleCommandCall * c)
 		return true;
 	}
 
-	if(c->hasSwitch('r',"tqreplace"))g_pRegisteredUserDataBase->removeUser(szName);
+	if(c->hasSwitch('r',"replace"))g_pRegisteredUserDataBase->removeUser(szName);
 
 
 	KviRegisteredUser * u = g_pRegisteredUserDataBase->addUser(szName);
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 07f37afe..2bd8e6e3 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -46,7 +46,7 @@
 		on the Advanced Encryptiong Standard algorithm called Rijndael. Rijndael was
 		originally written by Joan Daemen and Vincent Rijmen. The original Rijndael
 		description is available at http://www.esat.kuleuven.ac.be/~rijmen/rijndael/.[br]
-		It is a private key block cipher that has been designed to tqreplace
+		It is a private key block cipher that has been designed to replace
 		the widely used DES, and it should provide at leas a decent security agains
 		common attacks. Theoretically the best attack that one can perform on this cipher
 		is the "brute force" attack that requires a really massive parallel computation:
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 07ffc359..d5989c98 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -76,7 +76,7 @@ KVIMODULEEXPORTFUNC void setup_finish()
 		KVI_OPTION_STRING(KviOption_stringIncomingPath) = g_szChoosenIncomingDirectory;
 		// Reset the quit message and the real name... if they contain the KVIrc version
 		// then probably the user hasn't even edited them.
-		if(KVI_OPTION_STRING(KviOption_stringQuitMessage).tqfind("KVIrc",0,false) != -1)
+		if(KVI_OPTION_STRING(KviOption_stringQuitMessage).find("KVIrc",0,false) != -1)
 			KVI_OPTION_STRING(KviOption_stringQuitMessage) = KVI_DEFAULT_TQUIT_MESSAGE;
 		// We deserve to change the user's part message in something nice :)
 		KVI_OPTION_STRING(KviOption_stringPartMessage) = KVI_DEFAULT_PART_MESSAGE;
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 3d23a476..858bad64 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -911,9 +911,9 @@ void KviSetupWizard::setUrlHandlers()
 
 	TQString szKvircExec = g_pApp->m_szGlobalKvircDir;
 	szKvircExec.append("\\kvirc.exe");
-	szKvircExec.tqreplace("\\","\\\\");
+	szKvircExec.replace("\\","\\\\");
 
-	szReg.tqreplace("@KVIRCEXECUTABLE@",TQTextCodec::codecForLocale()->fromUnicode(szKvircExec));
+	szReg.replace("@KVIRCEXECUTABLE@",TQTextCodec::codecForLocale()->fromUnicode(szKvircExec));
 
 	TQString szRegFile = g_pApp->m_szGlobalKvircDir;
 	szRegFile.append("\\kvirc.reg");
@@ -1042,7 +1042,7 @@ void KviSetupWizard::accept()
 			//m_pOtherInfoSelector->commit();
 			
 			KVI_OPTION_STRING(KviOption_stringNickname1).stripWhiteSpace();
-			KVI_OPTION_STRING(KviOption_stringNickname1).tqreplace(" ","");
+			KVI_OPTION_STRING(KviOption_stringNickname1).replace(" ","");
 			
 			if(KVI_OPTION_STRING(KviOption_stringNickname1).length() > 32)
 			{
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index adbf7af1..446879a6 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -96,7 +96,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 
 	kvs_int_t timeout = 0;
 
-	if(KviKvsVariant * v = c->switches()->tqfind('t',"timeout"))
+	if(KviKvsVariant * v = c->switches()->find('t',"timeout"))
 	{
 		if(!v->asInteger(timeout))
 		{
@@ -108,7 +108,7 @@ static bool sharedfile_kvs_cmd_add(KviKvsModuleCommandCall * c)
 	TQString szVisibleName = szFileName;
 	KviTQString::cutToLast(szVisibleName,'/');
 
-	if(KviKvsVariant * n = c->switches()->tqfind('n',"name"))
+	if(KviKvsVariant * n = c->switches()->find('n',"name"))
 	{
 		TQString tmp;
 		n->asString(tmp);
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index 48e81dc8..a7f6bc20 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -47,7 +47,7 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension
 	{
 		if(s->pParams)
 		{
-			if(TQVariant * v = s->pParams->tqfind("bCreateMinimized"))
+			if(TQVariant * v = s->pParams->find("bCreateMinimized"))
 			{
 				if(v->isValid())
 				{
@@ -67,7 +67,7 @@ static KviModuleExtension * sharedfileswindow_extension_alloc(KviModuleExtension
 
 	if(s->pParams)
 	{
-		if(TQVariant * v = s->pParams->tqfind("bNoRaise"))
+		if(TQVariant * v = s->pParams->find("bNoRaise"))
 		{
 			if(v)
 			{
@@ -108,8 +108,8 @@ static bool sharedfileswindow_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	{
 		KviPointerHashTable<TQString,TQVariant> dict(17,true);
 		dict.setAutoDelete(true);
-		dict.tqreplace("bCreateMinimized",new TQVariant(c->hasSwitch('m',"minimized")));
-		dict.tqreplace("bNoRaise",new TQVariant(c->hasSwitch('n',"noraise")));
+		dict.replace("bCreateMinimized",new TQVariant(c->hasSwitch('m',"minimized")));
+		dict.replace("bNoRaise",new TQVariant(c->hasSwitch('n',"noraise")));
 
 		d->allocate(c->window(),&dict,0);
 	} else {
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 7e2364fe..7c40b6e3 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -535,7 +535,7 @@ void KviSharedFilesWindow::openLocalFileTerminal()
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
 
-	int idx = tmp.tqfindRev("/");
+	int idx = tmp.findRev("/");
 	if(idx == -1)return;
 	tmp = tmp.left(idx);
 
@@ -606,7 +606,7 @@ void KviSharedFilesWindow::openLocalFileFolder()
 	TQString tmp = t->localFileName();
 	if(tmp.isEmpty())return;
 
-	int idx = tmp.tqfindRev("/");
+	int idx = tmp.findRev("/");
 	if(idx == -1)return;
 	tmp = tmp.left(idx);
 
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 70ade834..fcd00a58 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -290,14 +290,14 @@ bool KviSoundPlayer::playNull(const TQString &szFileName)
 bool KviSoundPlayer::play(const TQString &szFileName)
 {
 	if(isMuted()) return true;
-	SoundSystemRoutine * r = m_pSoundSystemDict->tqfind(KVI_OPTION_STRING(KviOption_stringSoundSystem));
+	SoundSystemRoutine * r = m_pSoundSystemDict->find(KVI_OPTION_STRING(KviOption_stringSoundSystem));
 
 	if(!r)
 	{
 		if(KviTQString::equalCI(KVI_OPTION_STRING(KviOption_stringSoundSystem),"unknown"))
 		{
 			detectSoundSystem();
-			r = m_pSoundSystemDict->tqfind(KVI_OPTION_STRING(KviOption_stringSoundSystem));
+			r = m_pSoundSystemDict->find(KVI_OPTION_STRING(KviOption_stringSoundSystem));
 			if(!r)return false;
 		} else {
 			return false;
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 0403bbc1..de2236c1 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -377,15 +377,15 @@ static bool str_kvs_fnc_isempty(KviKvsModuleFunctionCall * c)
 }
 
 /*
-	@doc: str.tqcontains
+	@doc: str.contains
 	@type:
 		function
 	@title:
-		$str.tqcontains
+		$str.contains
 	@short:
 		Returns 1 if the first parameter contains the second
 	@syntax:
-		<bool> $str.tqcontains(<container:string>,<totqfind:string>)
+		<bool> $str.contains(<container:string>,<tofind:string>)
 	@description:
 		Returns 1 if the first string parameter contains the second string parameter.
 		This function is case sensitive.
@@ -394,15 +394,15 @@ static bool str_kvs_fnc_isempty(KviKvsModuleFunctionCall * c)
 */
 
 
-static bool str_kvs_fnc_tqcontains(KviKvsModuleFunctionCall * c)
+static bool str_kvs_fnc_contains(KviKvsModuleFunctionCall * c)
 {
 	TQString szString,szSubString;
 	bool bIs;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("container",KVS_PT_STRING,0,szString)
-		KVSM_PARAMETER("totqfind",KVS_PT_STRING,0,szSubString)
+		KVSM_PARAMETER("tofind",KVS_PT_STRING,0,szSubString)
 	KVSM_PARAMETERS_END(c)
-	bIs = szString.tqfind(szSubString) != -1;
+	bIs = szString.find(szSubString) != -1;
 	c->returnValue()->setBoolean(bIs);
 	return true;
 }
@@ -416,12 +416,12 @@ static bool str_kvs_fnc_tqcontains(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns 1 if the first parameter contains the second, case insensitive
 	@syntax:
-		<bool> $str.containsnocase(<container:string>,<totqfind:string>)
+		<bool> $str.containsnocase(<container:string>,<tofind:string>)
 	@description:
 		Returns 1 if the first string parameter contains the second string parameter
 		whithout taking in consideration the case of the characters in the string.
 	@seealso:
-		[fnc]$str.tqcontains[/fnc]
+		[fnc]$str.contains[/fnc]
 */
 
 static bool str_kvs_fnc_containsnocase(KviKvsModuleFunctionCall * c)
@@ -430,9 +430,9 @@ static bool str_kvs_fnc_containsnocase(KviKvsModuleFunctionCall * c)
 	bool bIs;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("container",KVS_PT_STRING,0,szString)
-		KVSM_PARAMETER("totqfind",KVS_PT_STRING,0,szSubString)
+		KVSM_PARAMETER("tofind",KVS_PT_STRING,0,szSubString)
 	KVSM_PARAMETERS_END(c)
-	bIs = szString.tqfind(szSubString,0,false) != -1;
+	bIs = szString.find(szSubString,0,false) != -1;
 	c->returnValue()->setBoolean(bIs);
 	return true;
 }
@@ -557,15 +557,15 @@ static bool str_kvs_fnc_cmpnocase(KviKvsModuleFunctionCall * c)
 }
 
 /*
-	@doc: str.tqfind
+	@doc: str.find
 	@type:
 		function
 	@title:
-		$str.tqfind
+		$str.find
 	@short:
 		Find the index of the nth ocurrence of a substring in a string
 	@syntax:
-		<int> $str.tqfind(<findIn:string>,<totqfind:string>[,ocurrence:int])
+		<int> $str.find(<findIn:string>,<tofind:string>[,ocurrence:int])
 	@description:
 		This function search in the string given as the first parameter for the string
 		given as his second parameter, and will return the index where the nth ocurrence
@@ -576,13 +576,13 @@ static bool str_kvs_fnc_cmpnocase(KviKvsModuleFunctionCall * c)
 		FIXME: The semantics of this function are totally broken :(
 */
 
-static bool str_kvs_fnc_tqfind(KviKvsModuleFunctionCall * c)
+static bool str_kvs_fnc_find(KviKvsModuleFunctionCall * c)
 {
 	TQString szFindIn, szToFind;
 	kvs_int_t iOcurence;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szFindIn)
-		KVSM_PARAMETER("totqfind",KVS_PT_STRING,0,szToFind)
+		KVSM_PARAMETER("tofind",KVS_PT_STRING,0,szToFind)
 		KVSM_PARAMETER("ocurrence",KVS_PT_INTEGER,KVS_PF_OPTIONAL,iOcurence)
 	KVSM_PARAMETERS_END(c)
 	int pos = 1;
@@ -609,7 +609,7 @@ static bool str_kvs_fnc_tqfind(KviKvsModuleFunctionCall * c)
 
 	while (cnt<=pos)
 	{
-	 	idx = szFindIn.right(szFindIn.length() - totalIdx).tqfind(szToFind);
+	 	idx = szFindIn.right(szFindIn.length() - totalIdx).find(szToFind);
 		if(idx == -1)
 		{
 			c->returnValue()->setInteger(-1);
@@ -646,7 +646,7 @@ static bool str_kvs_fnc_findfirst(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2)
 	KVSM_PARAMETERS_END(c)
-	c->returnValue()->setInteger(szString.tqfind(szString2));
+	c->returnValue()->setInteger(szString.find(szString2));
 	return true;
 }
 /*
@@ -672,7 +672,7 @@ static bool str_kvs_fnc_findfirstnocase(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2)
 	KVSM_PARAMETERS_END(c)
-	c->returnValue()->setInteger(szString.tqfind(szString2,0,false));
+	c->returnValue()->setInteger(szString.find(szString2,0,false));
 	return true;
 }
 /*
@@ -698,7 +698,7 @@ static bool str_kvs_fnc_findlast(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2)
 	KVSM_PARAMETERS_END(c)
-	c->returnValue()->setInteger(szString.tqfindRev(szString2));
+	c->returnValue()->setInteger(szString.findRev(szString2));
 	return true;
 }
 /*
@@ -724,7 +724,7 @@ static bool str_kvs_fnc_findlastnocase(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("findIn",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("toFind",KVS_PT_STRING,0,szString2)
 	KVSM_PARAMETERS_END(c)
-	c->returnValue()->setInteger(szString.tqfindRev(szString2,-1,false));
+	c->returnValue()->setInteger(szString.findRev(szString2,-1,false));
 	return true;
 }
 /*
@@ -994,37 +994,37 @@ static bool str_kvs_fnc_stripcolors(KviKvsModuleFunctionCall * c)
 }
 
 /*
-	@doc: str.tqreplace
+	@doc: str.replace
 	@type:
 		function
 	@title:
-		$str.tqreplace
+		$str.replace
 	@short:
 		Replace substrings in a string
 	@syntax:
-		<string> $str.tqreplace(<string:string>,<replacewith:string>,<totqreplace:string>)
+		<string> $str.replace(<string:string>,<replacewith:string>,<toreplace:string>)
 	@description:
 		This function returns a string created replacing all ocurrences of the third parameter
-		('totqreplace') in the string given as the first parameter ('string') with the string
+		('toreplace') in the string given as the first parameter ('string') with the string
 		given as the second parameter ('replacewith').
 		The string replacement is case sensitive!.
 		FIXME: The order of the parameters in this function is illogical (and probably incompatible
 		with any other scripting language) :D
 	@examples:
 		[example]
-			echo $str.tqreplace("I like big networks","neural","big")
+			echo $str.replace("I like big networks","neural","big")
 		[/example]
 */
 
-static bool str_kvs_fnc_tqreplace(KviKvsModuleFunctionCall * c)
+static bool str_kvs_fnc_replace(KviKvsModuleFunctionCall * c)
 {
-	TQString szString,szNewstr,szTotqreplace;
+	TQString szString,szNewstr,szToreplace;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("newstr",KVS_PT_STRING,0,szNewstr)
-		KVSM_PARAMETER("totqreplace",KVS_PT_STRING,0,szTotqreplace)
+		KVSM_PARAMETER("toreplace",KVS_PT_STRING,0,szToreplace)
 	KVSM_PARAMETERS_END(c)
-	szString.tqreplace(szTotqreplace,szNewstr);
+	szString.replace(szToreplace,szNewstr);
 	c->returnValue()->setString(szString);
 	return true;
 }
@@ -1038,10 +1038,10 @@ static bool str_kvs_fnc_tqreplace(KviKvsModuleFunctionCall * c)
 	@short:
 		Replace substrings in a string ignoring case
 	@syntax:
-		<string> $str.replacenocase(<string:string>,<newstr:string>,<totqreplace:string>)
+		<string> $str.replacenocase(<string:string>,<newstr:string>,<toreplace:string>)
 	@description:
 		This function returns a string created replacing all ocurrences of the third parameter
-		('totqreplace') in the string given as the first parameter ('string') with the string
+		('toreplace') in the string given as the first parameter ('string') with the string
 		given as the second parameter ('newstr').[br]
 		The replacement is case insensitive.[br]
 		FIXME: The order of the parameters in this function is illogical (and probably incompatible
@@ -1050,13 +1050,13 @@ static bool str_kvs_fnc_tqreplace(KviKvsModuleFunctionCall * c)
 
 static bool str_kvs_fnc_replacenocase(KviKvsModuleFunctionCall * c)
 {
-	TQString szString,szNewstr,szTotqreplace;
+	TQString szString,szNewstr,szToreplace;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("newstr",KVS_PT_STRING,0,szNewstr)
-		KVSM_PARAMETER("totqreplace",KVS_PT_STRING,0,szTotqreplace)
+		KVSM_PARAMETER("toreplace",KVS_PT_STRING,0,szToreplace)
 	KVSM_PARAMETERS_END(c)
-	szString.tqreplace(szTotqreplace,szNewstr,false);
+	szString.replace(szToreplace,szNewstr,false);
 	c->returnValue()->setString(szString);
 	return true;
 }
@@ -1090,12 +1090,12 @@ static bool str_kvs_fnc_urlencode(KviKvsModuleFunctionCall * c)
 
 	/*
 	for(int idx=0,idx<22,idx++)
-		szNewstr=szString.tqreplace(toReplace[idx],newStr[idx],false);
+		szNewstr=szString.replace(toReplace[idx],newStr[idx],false);
 	*/
 
 	int idx=0;
 	while(idx<20){
-		szNewstr=szString.tqreplace(toReplace[idx],newStr[idx],false);
+		szNewstr=szString.replace(toReplace[idx],newStr[idx],false);
 		idx++;
 	}
 
@@ -1129,7 +1129,7 @@ static bool str_kvs_fnc_lefttofirst(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr)
 	KVSM_PARAMETERS_END(c)
-	where = szString.tqfind(szNewstr,false);
+	where = szString.find(szNewstr,false);
 	if(where != -1) c->returnValue()->setString(szString.left(where));
 	else c->returnValue()->setString(szString);
 	return true;
@@ -1159,7 +1159,7 @@ static bool str_kvs_fnc_lefttolast(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr)
 	KVSM_PARAMETERS_END(c)
-	int where = szString.tqfindRev(szNewstr,-1,false);
+	int where = szString.findRev(szNewstr,-1,false);
 	if(where != -1) c->returnValue()->setString(szString.left(where));
 	else c->returnValue()->setString(szString);
 	return true;
@@ -1189,7 +1189,7 @@ static bool str_kvs_fnc_rightfromfirst(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr)
 	KVSM_PARAMETERS_END(c)
-	int idx = szString.tqfind(szNewstr,false);
+	int idx = szString.find(szNewstr,false);
 	if(idx != -1) c->returnValue()->setString(szString.right(szString.length()-(idx+szNewstr.length())));
 	else c->returnValue()->setString("");
 	return true;
@@ -1220,7 +1220,7 @@ static bool str_kvs_fnc_rightfromlast(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("substring",KVS_PT_STRING,0,szNewstr)
 	KVSM_PARAMETERS_END(c)
-	int idx = szString.tqfindRev(szNewstr,-1,false);
+	int idx = szString.findRev(szNewstr,-1,false);
 	if(idx != -1) c->returnValue()->setString(szString.right(szString.length()-(idx+szNewstr.length())));
 	else c->returnValue()->setString("");
 	return true;
@@ -1265,8 +1265,8 @@ static bool str_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
-	bool bRegExp = (szFlags.tqfind(TQChar('r')) != -1) || (szFlags.tqfind(TQChar('R')) != -1);
-	bool bExact = (szFlags.tqfind(TQChar('e')) != -1) || (szFlags.tqfind(TQChar('E')) != -1);
+	bool bRegExp = (szFlags.find(TQChar('r')) != -1) || (szFlags.find(TQChar('R')) != -1);
+	bool bExact = (szFlags.find(TQChar('e')) != -1) || (szFlags.find(TQChar('E')) != -1);
 	c->returnValue()->setBoolean(KviTQString::matchStringCS(szWildcard,szString,bRegExp,bExact));
 	return true;
 }
@@ -1311,8 +1311,8 @@ static bool str_kvs_fnc_matchnocase(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("string",KVS_PT_STRING,0,szString)
 		KVSM_PARAMETER("flags",KVS_PT_STRING,KVS_PF_OPTIONAL,szFlags)
 	KVSM_PARAMETERS_END(c)
-	bool bRegExp = (szFlags.tqfind(TQChar('r')) != -1) || (szFlags.tqfind(TQChar('R')) != -1);
-	bool bExact = (szFlags.tqfind(TQChar('e')) != -1) || (szFlags.tqfind(TQChar('E')) != -1);
+	bool bRegExp = (szFlags.find(TQChar('r')) != -1) || (szFlags.find(TQChar('R')) != -1);
+	bool bExact = (szFlags.find(TQChar('e')) != -1) || (szFlags.find(TQChar('E')) != -1);
 	c->returnValue()->setBoolean(KviTQString::matchStringCI(szWildcard,szString,bRegExp,bExact));
 	return true;
 }
@@ -1435,13 +1435,13 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c)
 	{
 		TQChar szTmp = szString[idx].tqunicode();
 //		while (szTmp==sep)
-		while (sep.tqcontains(szTmp))
+		while (sep.contains(szTmp))
 		{
 			idx++;
 			 szTmp = szString[idx].tqunicode();
 		}
 		begin = idx;
-		while (idx<len && !sep.tqcontains(szTmp))
+		while (idx<len && !sep.contains(szTmp))
 		{
 			idx++;
 			szTmp = szString[idx].tqunicode();
@@ -1600,7 +1600,7 @@ static bool str_kvs_fnc_join(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 
 	TQString szRet;
-	bool bSkipEmpty = szFlags.tqfind('n',0,false) != -1;
+	bool bSkipEmpty = szFlags.find('n',0,false) != -1;
 
 	bool bFirst = true;
 
@@ -1693,9 +1693,9 @@ static bool str_kvs_fnc_grep(KviKvsModuleFunctionCall * c)
 
 	KviKvsArray * a = ac.array();
 
-	bool bCaseSensitive = szFlags.tqfind('s',0,false) != -1;
-	bool bRegexp = szFlags.tqfind('r',0,false) != -1;
-	bool bWild = szFlags.tqfind('w',0,false) != -1;
+	bool bCaseSensitive = szFlags.find('s',0,false) != -1;
+	bool bRegexp = szFlags.find('r',0,false) != -1;
+	bool bWild = szFlags.find('w',0,false) != -1;
 	int idx = 0;
 	int cnt = a->size();
 
@@ -1726,7 +1726,7 @@ static bool str_kvs_fnc_grep(KviKvsModuleFunctionCall * c)
 			{
 				TQString sz;
 				v->asString(sz);
-				if(sz.tqfind(szMatch,0,bCaseSensitive) != -1)
+				if(sz.find(szMatch,0,bCaseSensitive) != -1)
 				{
 					n->set(i,new KviKvsVariant(sz));
 					i++;
@@ -1812,10 +1812,10 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c)
 
 	if(iMaxItems == 0)return true;
 
-	bool bWild = szFla.tqfind('w',0,false) != -1;
-	bool bContainsR = szFla.tqfind('r',0,false) != -1;
-	bool bCaseSensitive = szFla.tqfind('s',0,false) != -1;
-	bool bNoEmpty = szFla.tqfind('n',0,false) != -1;
+	bool bWild = szFla.find('w',0,false) != -1;
+	bool bContainsR = szFla.find('r',0,false) != -1;
+	bool bCaseSensitive = szFla.find('s',0,false) != -1;
+	bool bNoEmpty = szFla.find('n',0,false) != -1;
 
 	int id = 0;
 
@@ -1855,7 +1855,7 @@ static bool str_kvs_fnc_split(KviKvsModuleFunctionCall * c)
 	} else {
 		while((iMatch != -1) && (iMatch < iStrLen) && ((id < (iMaxItems-1)) || (iMaxItems < 0)))
 		{
-			iMatch = szStr.tqfind(szSep,iBegin,bCaseSensitive);
+			iMatch = szStr.find(szSep,iBegin,bCaseSensitive);
 			if(iMatch != -1)
 			{
 				TQString tmp = szStr.mid(iBegin,iMatch - iBegin);
@@ -2270,13 +2270,13 @@ static bool str_module_init(KviModule * m)
 	KVSM_REGISTER_FUNCTION(m,"localelowcase",str_kvs_fnc_localelowcase);
 	KVSM_REGISTER_FUNCTION(m,"isnumber",str_kvs_fnc_isnumber);
 	KVSM_REGISTER_FUNCTION(m,"isunsignednumber",str_kvs_fnc_isunsignednumber);
-	KVSM_REGISTER_FUNCTION(m,"tqcontains",str_kvs_fnc_tqcontains);
+	KVSM_REGISTER_FUNCTION(m,"contains",str_kvs_fnc_contains);
 	KVSM_REGISTER_FUNCTION(m,"containsnocase",str_kvs_fnc_containsnocase);
 	KVSM_REGISTER_FUNCTION(m,"equal",str_kvs_fnc_equal);
 	KVSM_REGISTER_FUNCTION(m,"equalnocase",str_kvs_fnc_equalnocase);
 	KVSM_REGISTER_FUNCTION(m,"cmp",str_kvs_fnc_cmp);
 	KVSM_REGISTER_FUNCTION(m,"cmpnocase",str_kvs_fnc_cmpnocase);
-	KVSM_REGISTER_FUNCTION(m,"tqfind",str_kvs_fnc_tqfind);
+	KVSM_REGISTER_FUNCTION(m,"find",str_kvs_fnc_find);
 	KVSM_REGISTER_FUNCTION(m,"findfirst",str_kvs_fnc_findfirst);
 	KVSM_REGISTER_FUNCTION(m,"findfirstnocase",str_kvs_fnc_findfirstnocase);
 	KVSM_REGISTER_FUNCTION(m,"findlast",str_kvs_fnc_findlast);
@@ -2291,7 +2291,7 @@ static bool str_module_init(KviModule * m)
 	KVSM_REGISTER_FUNCTION(m,"stripright",str_kvs_fnc_stripright);
 	KVSM_REGISTER_FUNCTION(m,"stripleft",str_kvs_fnc_stripleft);
 	KVSM_REGISTER_FUNCTION(m,"stripcolors",str_kvs_fnc_stripcolors);
-	KVSM_REGISTER_FUNCTION(m,"tqreplace",str_kvs_fnc_tqreplace);
+	KVSM_REGISTER_FUNCTION(m,"replace",str_kvs_fnc_replace);
 	KVSM_REGISTER_FUNCTION(m,"replacenocase",str_kvs_fnc_replacenocase);
 	KVSM_REGISTER_FUNCTION(m,"urlencode",str_kvs_fnc_urlencode);
 	KVSM_REGISTER_FUNCTION(m,"lefttolast",str_kvs_fnc_lefttolast);
diff --git a/src/modules/system/plugin.cpp b/src/modules/system/plugin.cpp
index 5891c39c..cb711aaf 100644
--- a/src/modules/system/plugin.cpp
+++ b/src/modules/system/plugin.cpp
@@ -397,7 +397,7 @@ bool KviPluginManager::findPlugin(TQString& szPath)
 
 bool KviPluginManager::isPluginLoaded(const TQString& pSingleName)
 {
-	KviPlugin * p = m_pPluginDict->tqfind(pSingleName);
+	KviPlugin * p = m_pPluginDict->find(pSingleName);
 	if (!p)
 		return false;
 	else
@@ -422,6 +422,6 @@ bool KviPluginManager::loadPlugin(const TQString& szPluginPath)
 
 KviPlugin * KviPluginManager::getPlugin(const TQString& szPluginPath)
 {
-	KviPlugin * p = m_pPluginDict->tqfind(szPluginPath);
+	KviPlugin * p = m_pPluginDict->find(szPluginPath);
 	return p;
 }
\ No newline at end of file
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index de9b2333..d29c6322 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -97,7 +97,7 @@ KviPackThemeDialog::KviPackThemeDialog(TQWidget * pParent,KviPointerList<KviThem
 			szPackageVersion = pThemeInfo->version();
 
 			m_szPackagePath += pThemeInfo->subdirectory();
-			if(m_szPackagePath.tqfind(TQRegExp("[0-9]\\.[0-9]")) == -1)
+			if(m_szPackagePath.find(TQRegExp("[0-9]\\.[0-9]")) == -1)
 			{
 				m_szPackagePath += "-";
 				m_szPackagePath += szPackageVersion;
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index fb7cee03..a38f33e2 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -254,7 +254,7 @@ bool KviSaveThemeDialog::saveTheme()
 	if(sto.version().isEmpty())sto.setVersion("1.0.0");
 
 	TQString szSubdir = sto.name() + TQString("-") + sto.version();
-	szSubdir.tqreplace(TQRegExp("[ \\\\/:][ \\\\/:]*"),"_");
+	szSubdir.replace(TQRegExp("[ \\\\/:][ \\\\/:]*"),"_");
 	sto.setSubdirectory(szSubdir);
 
 	TQString szAbsDir;
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index c215d943..280d0192 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -73,21 +73,21 @@ namespace KviThemeFunctions
 	
 		pInfoFields = r.stringInfoFields();
 	
-		pValue = pInfoFields->tqfind("PackageType");
+		pValue = pInfoFields->find("PackageType");
 		if(!pValue)return notAValidThemePackage(szError);
 		if(!KviTQString::equalCI(*pValue,"ThemePack"))return notAValidThemePackage(szError);
-		pValue = pInfoFields->tqfind("ThemePackVersion");
+		pValue = pInfoFields->find("ThemePackVersion");
 		if(!pValue)return notAValidThemePackage(szError);
 		if(!KviTQString::equalCI(*pValue,"1"))return notAValidThemePackage(szError);
 		
 		// make sure the default fields exist
 		for(int i=0;i<6;i++)
 		{
-			pValue = pInfoFields->tqfind(check_fields[i]);
+			pValue = pInfoFields->find(check_fields[i]);
 			if(!pValue)return notAValidThemePackage(szError);
 		}
 	
-		pValue = pInfoFields->tqfind("ThemeCount");
+		pValue = pInfoFields->find("ThemeCount");
 		if(!pValue)return notAValidThemePackage(szError);
 		bool bOk;
 		int iThemeCount = pValue->toInt(&bOk);
@@ -97,7 +97,7 @@ namespace KviThemeFunctions
 		// ok.. it should be really valid at this point
 		
 		// load its picture
-		pByteArray = r.binaryInfoFields()->tqfind("Image");
+		pByteArray = r.binaryInfoFields()->find("Image");
 		if(pByteArray)
 			pix.loadFromData(*pByteArray,0,0);
 		
@@ -164,7 +164,7 @@ namespace KviThemeFunctions
 			r.getStringInfoField(szTmp,szThemeThemeEngineVersion);
 			KviTQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
 			TQPixmap pixScreenshot;
-			pByteArray = r.binaryInfoFields()->tqfind(szTmp);
+			pByteArray = r.binaryInfoFields()->find(szTmp);
 			if(pByteArray)
 				pixScreenshot.loadFromData(*pByteArray,0,0);
 
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index 714de08f..5940b325 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -87,10 +87,10 @@ static bool toolbar_kvs_cmd_create(KviKvsModuleCommandCall * c)
 */	
 	if(szLabel.isEmpty())szLabel = "$tr(Unnamed)";
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 	if(d)
 	{
-		if(!c->switches()->tqfind('p',"preserve"))d->clear();
+		if(!c->switches()->find('p',"preserve"))d->clear();
 		d->rename(szLabel);
 	} else {
 		d = KviCustomToolBarManager::instance()->create(szId,szLabel);
@@ -132,10 +132,10 @@ static bool toolbar_kvs_cmd_clear(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 	if(d)d->clear();
 	else {
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The specified toolbar doesn't exist"));
 	}
 
@@ -178,7 +178,7 @@ static bool toolbar_kvs_cmd_destroy(KviKvsModuleCommandCall * c)
 
 	if(!KviCustomToolBarManager::instance()->destroyDescriptor(szId))
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The specified toolbar doesn't exist"));
 	}
 
@@ -219,11 +219,11 @@ static bool toolbar_kvs_cmd_show(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 
 	if(!d)
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The specified toolbar doesn't exist"));
 		return true;
 	}
@@ -268,11 +268,11 @@ static bool toolbar_kvs_cmd_hide(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 
 	if(!d)
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The specified toolbar doesn't exist"));
 		return true;
 	}
@@ -307,7 +307,7 @@ static bool toolbar_kvs_fnc_exists(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	c->returnValue()->setBoolean(KviCustomToolBarManager::instance()->tqfind(szId) ? true : false);
+	c->returnValue()->setBoolean(KviCustomToolBarManager::instance()->find(szId) ? true : false);
 	return true;
 }
 
@@ -334,7 +334,7 @@ static bool toolbar_kvs_fnc_isVisible(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId)
 	KVSM_PARAMETERS_END(c)
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 	c->returnValue()->setBoolean(d ? (d->toolBar() ? true : false) : false);
 	return true;
 }
@@ -416,33 +416,33 @@ static bool toolbar_kvs_cmd_removeitem(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("action",KVS_PT_VARIANT,0,pvAction)
 	KVSM_PARAMETERS_END(c)
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 
 	if(!pvAction)
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->error(__tr2qs("No action name/index specified")); // syntax error
 		return false;
 	}
 
 	if(!d)
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The specified toolbar doesn't exist"));
 		return true;
 	}
 
-	if(c->switches()->tqfind('i',"index"))
+	if(c->switches()->find('i',"index"))
 	{
 		kvs_int_t iAction;
 		if(!pvAction->asInteger(iAction))
 		{
-			if(!c->switches()->tqfind('q',"quiet"))
+			if(!c->switches()->find('q',"quiet"))
 				c->warning(__tr2qs("The action parameter didn't evaluate to an index"));
 		} else {
 			if(!d->removeAction(iAction))
 			{
-				if(!c->switches()->tqfind('q',"quiet"))
+				if(!c->switches()->find('q',"quiet"))
 					c->warning(__tr2qs("The toolbar does not contain the specified item"));
 			}
 		}
@@ -451,7 +451,7 @@ static bool toolbar_kvs_cmd_removeitem(KviKvsModuleCommandCall * c)
 		pvAction->asString(szAction);
 		if(!d->removeAction(szAction))
 		{
-			if(!c->switches()->tqfind('q',"quiet"))
+			if(!c->switches()->find('q',"quiet"))
 				c->warning(__tr2qs("The toolbar does not contain the specified item"));
 		}
 	}
@@ -499,18 +499,18 @@ static bool toolbar_kvs_cmd_additem(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("action",KVS_PT_NONEMPTYSTRING,0,szAction)
 	KVSM_PARAMETERS_END(c)
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 
 	if(!d)
 	{
-		if(!c->switches()->tqfind('q',"quiet"))
+		if(!c->switches()->find('q',"quiet"))
 			c->warning(__tr2qs("The specified toolbar doesn't exist"));
 		return true;
 	}
 
 	if(!d->addAction(szAction))
 	{
-		if(!c->switches()->tqfind('q',"quiet"))c->warning(__tr2qs("The action \"%Q\" doesn't exist"),&szAction);
+		if(!c->switches()->find('q',"quiet"))c->warning(__tr2qs("The action \"%Q\" doesn't exist"),&szAction);
 	}
 
 	return true;
@@ -540,7 +540,7 @@ static bool toolbar_kvs_fnc_items(KviKvsModuleFunctionCall * c)
 		KVSM_PARAMETER("id",KVS_PT_NONEMPTYSTRING,0,szId)
 	KVSM_PARAMETERS_END(c)
 
-	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->tqfind(szId);
+	KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->find(szId);
 
 	if(!d)
 	{
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index c392a7f8..34b06899 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -249,7 +249,7 @@ void KviCustomToolBarPropertiesDialog::okClicked()
 		m_szId = KviCustomToolBarManager::instance()->idForNewToolBar(m_szLabel);
 	}
 	
-	if(KviCustomToolBarManager::instance()->tqfind(m_szId))
+	if(KviCustomToolBarManager::instance()->find(m_szId))
 	{
 		if(m_szId != m_szOriginalId)
 		{
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index abe3d79e..9533eacf 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -238,7 +238,7 @@ void UrlDialog::findtext()
 	for(KviUrl *tmp=g_pList->first();tmp;tmp=g_pList->next())
 	{
 		if (tmp->url == KviStr(m_pUrlList->currentItem()->text(0))) {
-			g_pList->tqfind(tmp);
+			g_pList->find(tmp);
 			KviStr ft="findtext %";
 			ft.replaceAll('%',tmp->url.ptr());
 			KviWindow *wnd = m_pFrm->findWindow(tmp->window.ptr());
@@ -710,7 +710,7 @@ int check_url(KviWindow *w,const TQString &szUrl) // return 0 if no occurence of
 
 	for(KviStr *tmpi=g_pBanList->first();tmpi;tmpi=g_pBanList->next())
 	{
-		if (szUrl.tqfind(TQString(tmpi->ptr())) != -1) tmp++;
+		if (szUrl.find(TQString(tmpi->ptr())) != -1) tmp++;
 	}
 	if (tmp > 0) return tmp;
 
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index 1b46d366..7c83051e 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -1034,13 +1034,13 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 	iIcon = iIcon % KVI_NUM_SMALL_ICONS;
 
 	int iFlags = 0;
-	if(szFlags.tqcontains('i'))iFlags |= KviUserWindow::HasInput;
+	if(szFlags.contains('i'))iFlags |= KviUserWindow::HasInput;
 
 	KviConsole * pConsole = 0;
 	if(c->parameterList()->count() >= 3)
 	{
 		pConsole = g_pApp->findConsole(uCtx);
-		if(!pConsole && !szFlags.tqcontains('q'))
+		if(!pConsole && !szFlags.contains('q'))
 		{
 			c->warning(__tr2qs("The specified IRC context is not valid: creating a context free window"));
 		}
@@ -1053,8 +1053,8 @@ static bool window_kvs_fnc_open(KviKvsModuleFunctionCall * c)
 		pConsole,
 		iFlags);
 
-	c->window()->frame()->addWindow(wnd,!szFlags.tqcontains('m'));
-	if(szFlags.tqcontains('m'))wnd->minimize();
+	c->window()->frame()->addWindow(wnd,!szFlags.contains('m'));
+	if(szFlags.contains('m'))wnd->minimize();
 
 	c->returnValue()->setInteger(TQString(wnd->id()).toUInt());
 	return true;
-- 
cgit v1.2.1