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

204 files changed, 1305 insertions, 1305 deletions

diff --git a/data/defscript/installer.kvs b/data/defscript/installer.kvs
index f25aa78d..f974b7ed 100644
--- a/data/defscript/installer.kvs
+++ b/data/defscript/installer.kvs
@@ -71,7 +71,7 @@ class(installer,object)
 				@$mkdir($2)
 				foreach(%file,%files)
 				{
-					$this->%lFiles <+ $str.tqreplace($file.fixpath("$2/%file"),"\\\\","\\")
+					$this->%lFiles <+ $str.replace($file.fixpath("$2/%file"),"\\\\","\\")
 					file.copy -o $file.fixpath($0/%file) $file.fixpath($2/%file)
 				}
 			}
@@ -117,7 +117,7 @@ class(installer,object)
 		{
 			foreach(%file,%files)
 			{
-				$this->%lSources <+ $str.tqreplace($file.fixpath("$0/%file"),"\\\\","\\")
+				$this->%lSources <+ $str.replace($file.fixpath("$0/%file"),"\\\\","\\")
 				include $file.fixpath("$0/%file")
 			}
 		}
@@ -150,7 +150,7 @@ class(installer,object)
 					else if($str.match("toolbar.create * *",%line,e))
 						%c .= "	toolbar.destroy -q "$str.word(1,%line)"$lf"
 					else if($str.match("action.create* (*)",%line,e))
-						%c .= "	action.destroy -q "$str.tqreplace($str.token(1,"(,)",%line),,\")"$lf"
+						%c .= "	action.destroy -q "$str.replace($str.token(1,"(,)",%line),,\")"$lf"
 					else if($str.match("class(*)*",%line,e))
 						%c .= "	objects.killclass -q "$str.token(1,"(,)",%line)"$lf"
 				}
diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs
index 643a0377..7c5e1f67 100644
--- a/data/defscript/popups.kvs
+++ b/data/defscript/popups.kvs
@@ -1159,7 +1159,7 @@ defpopup(logging)
 
 		# If this window is being logged actually , $log.file will be non empty
 		# and pointing to the log file actually open.
-		%:logfile = $str.tqreplace($log.file,,$file.localdir)
+		%:logfile = $str.replace($log.file,,$file.localdir)
 	}
 
 	label($tr("Logging to"):<br><b>%:logfile</b>) ("%:logfile" != "")
diff --git a/data/doctemplates/rfc2812.template b/data/doctemplates/rfc2812.template
index b893d488..596f58b3 100644
--- a/data/doctemplates/rfc2812.template
+++ b/data/doctemplates/rfc2812.template
@@ -2914,7 +2914,7 @@ to 399.
        432    ERR_ERRONEUSNICKNAME
               "<nick> :Erroneous nickname"
 
-         - Returned after receiving a NICK message which tqcontains
+         - Returned after receiving a NICK message which contains
            characters which do not fall in the defined set.  See
            section 2.3.1 for details on valid nicknames.
 
diff --git a/src/kvilib/config/kvi_defaults.h b/src/kvilib/config/kvi_defaults.h
index 05b9c032..f7f9fd4c 100644
--- a/src/kvilib/config/kvi_defaults.h
+++ b/src/kvilib/config/kvi_defaults.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 //=============================================================================
-// This file tqcontains (more or less) freely customizable compile time defaults
+// This file contains (more or less) freely customizable compile time defaults
 //
 // You can safely play with the ones you understand the meaning of
 //=============================================================================
diff --git a/src/kvilib/core/kvi_pointerhashtable.h b/src/kvilib/core/kvi_pointerhashtable.h
index dceceeda..1c2bcab3 100644
--- a/src/kvilib/core/kvi_pointerhashtable.h
+++ b/src/kvilib/core/kvi_pointerhashtable.h
@@ -349,7 +349,7 @@ public:
 	/// Places the hash table iterator at the position
 	/// of the item found.
 	///
-	T * tqfind(const Key & hKey)
+	T * find(const Key & hKey)
 	{
 		m_uIteratorIdx = kvi_hash_hash(hKey,m_bCaseSensitive) % m_uSize;
 		if(!m_pDataArray[m_uIteratorIdx])return 0;
@@ -364,11 +364,11 @@ public:
 	/// Returns the item associated to the key hKey
 	/// or NULL if no such item exists in the hash table.
 	/// Places the hash table iterator at the position
-	/// of the item found. This is an alias to tqfind().
+	/// of the item found. This is an alias to find().
 	///
 	T * operator[](const Key & hKey)
 	{
-		return tqfind(hKey);
+		return find(hKey);
 	}
 
 	///
@@ -427,7 +427,7 @@ public:
 	/// The hash table iterator is placed at the newly inserted item.
 	/// This is just an alias to insert() with a different name.
 	///
-	void tqreplace(const Key & hKey,T * pData)
+	void replace(const Key & hKey,T * pData)
 	{
 		insert(hKey,pData);
 	}
@@ -522,7 +522,7 @@ public:
 	/// it's hash table entry, if found, and NULL otherwise.
 	/// The hash table iterator is placed at the item found.
 	///
-	KviPointerHashTableEntry<Key,T> * tqfindRef(const T * pRef)
+	KviPointerHashTableEntry<Key,T> * findRef(const T * pRef)
 	{
 		for(m_uIteratorIdx = 0;m_uIteratorIdx<m_uSize;m_uIteratorIdx++)
 		{
@@ -540,7 +540,7 @@ public:
 	///
 	/// Returns the entry pointed by the hash table iterator.
 	/// This function must be preceeded by a call to firstEntry(), first()
-	/// or tqfindRef().
+	/// or findRef().
 	///
 	KviPointerHashTableEntry<Key,T> * currentEntry()
 	{
@@ -568,7 +568,7 @@ public:
 	/// Places the hash table iterator at the next entry
 	/// and returns it.
 	/// This function must be preceeded by a call to firstEntry(), first()
-	/// or tqfindRef().
+	/// or findRef().
 	///
 	KviPointerHashTableEntry<Key,T> * nextEntry()
 	{
@@ -596,7 +596,7 @@ public:
 	///
 	/// Returns the data value pointer pointed by the hash table iterator.
 	/// This function must be preceeded by a call to firstEntry(), first()
-	/// or tqfindRef().
+	/// or findRef().
 	///
 	T * current()
 	{
@@ -613,7 +613,7 @@ public:
 	///
 	/// Returns the key pointed by the hash table iterator.
 	/// This function must be preceeded by a call to firstEntry(), first()
-	/// or tqfindRef().
+	/// or findRef().
 	///
 	const Key & currentKey()
 	{
@@ -648,7 +648,7 @@ public:
 	/// Places the hash table iterator at the next entry
 	/// and returns the associated data value pointer.
 	/// This function must be preceeded by a call to firstEntry(), first()
-	/// or tqfindRef().
+	/// or findRef().
 	///
 	T * next()
 	{
diff --git a/src/kvilib/core/kvi_pointerlist.h b/src/kvilib/core/kvi_pointerlist.h
index 2051036c..50970005 100644
--- a/src/kvilib/core/kvi_pointerlist.h
+++ b/src/kvilib/core/kvi_pointerlist.h
@@ -288,7 +288,7 @@ public:
 /// Iterating over pointers is also very fast and this
 /// class contains an internal iterator that allows to
 /// write loops in a compact and clean way.
-/// See the first(), next(), current() and tqfindRef()
+/// See the first(), next(), current() and findRef()
 /// functions for the description of this feature.
 ///
 /// There is also a non-const external iterator
@@ -618,7 +618,7 @@ public:
 	///
 	/// Returns the current iteration item
 	/// A call to this function MUST be preceded by a call to
-	/// first(),last(),at() or tqfindRef()
+	/// first(),last(),at() or findRef()
 	///
 	T * current()
 	{
@@ -628,7 +628,7 @@ public:
 	///
 	/// Returns the current iteration item
 	/// A call to this function should be preceded by a call to
-	/// first(),last(),at() or tqfindRef().
+	/// first(),last(),at() or findRef().
 	/// This function will return a NULL pointer if the current
 	/// item has been invalidated due to a remove operation.
 	///
@@ -641,7 +641,7 @@ public:
 	///
 	/// Returns an iterator pointing to the current item in the list.
 	/// A call to this function MUST be preceded by a call to
-	/// first(),last(),at() or tqfindRef()
+	/// first(),last(),at() or findRef()
 	///
 	KviPointerListIterator<T> iteratorAtCurrent()
 	{
@@ -652,7 +652,7 @@ public:
 	/// Sets the iteration pointer to the next item in the list
 	/// and returns that item (or 0 if the end of the list has been reached)
 	/// A call to this function MUST be preceded by a _succesfull_ call to
-	/// first(),last(),at() or tqfindRef().
+	/// first(),last(),at() or findRef().
 	///
 	T * next()
 	{
@@ -666,7 +666,7 @@ public:
 	/// Sets the iteration pointer to the previous item in the list
 	/// and returns that item (or 0 if the beginning of the list has been reached)
 	/// A call to this function MUST be preceded by a _succesfull_ call to
-	/// first(),last(),at() or tqfindRef()
+	/// first(),last(),at() or findRef()
 	///
 	T * prev()
 	{
@@ -715,7 +715,7 @@ public:
 	/// and returns its position (zero based index) in the list or -1 if the
 	/// item cannot be found
 	///
-	int tqfindRef(const T * d)
+	int findRef(const T * d)
 	{
 		int ret = 0;
 		for(T * t = first();t;t = next())
@@ -945,7 +945,7 @@ public:
 	///
 	bool removeRef(const T * d)
 	{
-		if(tqfindRef(d) == -1)return false;
+		if(findRef(d) == -1)return false;
 		removeCurrentSafe();
 		return true;
 	}
@@ -957,7 +957,7 @@ public:
 	///
 	void insertAfter(const T * ref,const T * d)
 	{
-		if(tqfindRef(ref) == -1)
+		if(findRef(ref) == -1)
 		{
 			append(d);
 			return;
@@ -981,7 +981,7 @@ public:
 	///
 	void insertBefore(const T * ref,const T * d)
 	{
-		if(tqfindRef(ref) == -1)
+		if(findRef(ref) == -1)
 		{
 			prepend(d);
 			return;
diff --git a/src/kvilib/core/kvi_qstring.cpp b/src/kvilib/core/kvi_qstring.cpp
index fd61aed4..f16ad0ad 100644
--- a/src/kvilib/core/kvi_qstring.cpp
+++ b/src/kvilib/core/kvi_qstring.cpp
@@ -934,7 +934,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.indexOf(c);
 #else
-		int idx = s.tqfind(c);
+		int idx = s.find(c);
 #endif
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + 1);
@@ -945,7 +945,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.lastIndexOf(c);
 #else
-		int idx = s.tqfindRev(c);
+		int idx = s.findRev(c);
 #endif
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + 1);
@@ -956,7 +956,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.indexOf(c);
 #else
-		int idx = s.tqfind(c);
+		int idx = s.find(c);
 #endif
 		if(idx == -1)
 		{
@@ -971,7 +971,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.lastIndexOf(c);
 #else
-		int idx = s.tqfindRev(c);
+		int idx = s.findRev(c);
 #endif
 		if(idx == -1)
 		{
@@ -986,7 +986,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.indexOf(c);
 #else
-		int idx = s.tqfind(c);
+		int idx = s.find(c);
 #endif
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + c.length());
@@ -997,7 +997,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.lastIndexOf(c);
 #else
-		int idx = s.tqfindRev(c);
+		int idx = s.findRev(c);
 #endif
 		if(idx == -1)return;
 		s.truncate(bIncluded ? idx : idx + c.length());
@@ -1008,7 +1008,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.indexOf(c);
 #else
-		int idx = s.tqfind(c);
+		int idx = s.find(c);
 #endif
 		if(idx == -1)
 		{
@@ -1023,7 +1023,7 @@ namespace KviTQString
 #ifdef COMPILE_USE_QT4
 		int idx = s.lastIndexOf(c);
 #else
-		int idx = s.tqfindRev(c);
+		int idx = s.findRev(c);
 #endif
 		if(idx == -1)
 		{
diff --git a/src/kvilib/core/kvi_qstring.h b/src/kvilib/core/kvi_qstring.h
index dc75deb0..7f9f7e73 100644
--- a/src/kvilib/core/kvi_qstring.h
+++ b/src/kvilib/core/kvi_qstring.h
@@ -148,93 +148,93 @@ namespace KviTQString
 #endif
 	}
 	
-	inline int tqfind(const TQString &s,TQChar c,int index = 0,bool cs = true)
+	inline int find(const TQString &s,TQChar c,int index = 0,bool cs = true)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.indexOf(c,index,cs ? TQt::CaseSensitive : TQt::CaseInsensitive);
 #else
-		return s.tqfind(c,index,cs);
+		return s.find(c,index,cs);
 #endif
 	}
 
-	inline int tqfind(const TQString &s,char c,int index = 0,bool cs = true)
+	inline int find(const TQString &s,char c,int index = 0,bool cs = true)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.indexOf(c,index,cs ? TQt::CaseSensitive : TQt::CaseInsensitive);
 #else
-		return s.tqfind(c,index,cs);
+		return s.find(c,index,cs);
 #endif
 	}
 
-	inline int tqfind(const TQString &s,const TQString & str,int index = 0,bool cs = true)
+	inline int find(const TQString &s,const TQString & str,int index = 0,bool cs = true)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.indexOf(str,index,cs ? TQt::CaseSensitive : TQt::CaseInsensitive);
 #else
-		return s.tqfind(str,index,cs);
+		return s.find(str,index,cs);
 #endif
 	}
 
-	inline int tqfind(const TQString &s,const TQRegExp & rx,int index = 0)
+	inline int find(const TQString &s,const TQRegExp & rx,int index = 0)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.indexOf(rx,index);
 #else
-		return s.tqfind(rx,index);
+		return s.find(rx,index);
 #endif
 	}
 
-	inline int tqfind(const TQString &s,const char * str,int index = 0)
+	inline int find(const TQString &s,const char * str,int index = 0)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.indexOf(TQString(str),index);
 #else
-		return s.tqfind(str,index);
+		return s.find(str,index);
 #endif
 	}
 
-	inline int tqfindRev(const TQString &s,TQChar c,int index = -1,bool cs = true)
+	inline int findRev(const TQString &s,TQChar c,int index = -1,bool cs = true)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.lastIndexOf(c,index,cs ? TQt::CaseSensitive : TQt::CaseInsensitive);
 #else
-		return s.tqfindRev(c,index,cs);
+		return s.findRev(c,index,cs);
 #endif
 	}
 
-	inline int tqfindRev(const TQString &s,char c,int index = -1,bool cs = true)
+	inline int findRev(const TQString &s,char c,int index = -1,bool cs = true)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.lastIndexOf(c,index,cs ? TQt::CaseSensitive : TQt::CaseInsensitive);
 #else
-		return s.tqfindRev(c,index,cs);
+		return s.findRev(c,index,cs);
 #endif
 	}
 
-	inline int tqfindRev(const TQString &s,const TQString & str,int index = -1,bool cs = true)
+	inline int findRev(const TQString &s,const TQString & str,int index = -1,bool cs = true)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.lastIndexOf(str,index,cs ? TQt::CaseSensitive : TQt::CaseInsensitive);
 #else
-		return s.tqfindRev(str,index,cs);
+		return s.findRev(str,index,cs);
 #endif
 	}
 
-	inline int tqfindRev(const TQString &s,const TQRegExp & rx,int index = -1)
+	inline int findRev(const TQString &s,const TQRegExp & rx,int index = -1)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.lastIndexOf(rx,index);
 #else
-		return s.tqfindRev(rx,index);
+		return s.findRev(rx,index);
 #endif
 	}
 
-	inline int tqfindRev(const TQString &s,const char * str,int index = -1)
+	inline int findRev(const TQString &s,const char * str,int index = -1)
 	{
 #ifdef COMPILE_USE_QT4
 		return s.lastIndexOf(TQString(str),index);
 #else
-		return s.tqfindRev(str,index);
+		return s.findRev(str,index);
 #endif
 	}
 
diff --git a/src/kvilib/core/kvi_string.cpp b/src/kvilib/core/kvi_string.cpp
index df89122a..3eb7fa67 100644
--- a/src/kvilib/core/kvi_string.cpp
+++ b/src/kvilib/core/kvi_string.cpp
@@ -2203,7 +2203,7 @@ int KviStr::occurences(const char *str,bool caseS) const
 	return cnt;
 }
 
-bool KviStr::tqcontains(char c,bool caseS) const
+bool KviStr::contains(char c,bool caseS) const
 {
 	register char *p = m_ptr;
 	if(caseS)
@@ -2224,7 +2224,7 @@ bool KviStr::tqcontains(char c,bool caseS) const
 	return false;
 }
 
-bool KviStr::tqcontains(const char *str,bool caseS) const
+bool KviStr::contains(const char *str,bool caseS) const
 {
 	__range_valid(str);
 	register char *p = m_ptr;
@@ -2657,7 +2657,7 @@ KviStr & KviStr::sprintf(const char *fmt,...)
 	return (*this);
 }
 
-int KviStr::tqfind(const char *str,int idx,bool caseS) const
+int KviStr::find(const char *str,int idx,bool caseS) const
 {
 	if(idx >= m_len)return -1;
 	register char *p=m_ptr + idx;
@@ -2682,7 +2682,7 @@ int KviStr::tqfind(const char *str,int idx,bool caseS) const
 	}
 }
 
-int KviStr::tqfind(char c,int idx) const
+int KviStr::find(char c,int idx) const
 {
 	if(idx >= m_len)return -1;
 	register char *p=m_ptr + idx;
@@ -2691,7 +2691,7 @@ int KviStr::tqfind(char c,int idx) const
 }
 
 
-int KviStr::tqfindRev(const char *str,int idx,bool caseS) const
+int KviStr::findRev(const char *str,int idx,bool caseS) const
 {
 	if((m_len + idx) < 0)return -1;
 	register char *p=m_ptr + m_len + idx;
@@ -2729,10 +2729,10 @@ int KviStr::findFirstIdx(const char *str,bool caseS) const
 {
 	// This function can't be used to search inside
 	// multibyte encoded strings... convert your
-	// code to TQString and use TQString::tqfindRev().
+	// code to TQString and use TQString::findRev().
 	// We must throw away KviStr at all in this case...
 
-	// return TQString(m_ptr).tqfind(TQString(str),0,caseS);;
+	// return TQString(m_ptr).find(TQString(str),0,caseS);;
 	
 	// Both this KviStr and the const char * str are assumed
 	// to be in the proper (and same) encoding.
@@ -2782,10 +2782,10 @@ int KviStr::findLastIdx(const char *str,bool caseS) const
 {
 	// This function can't be used to search inside
 	// multibyte encoded strings... convert your
-	// code to TQString and use TQString::tqfindRev().
+	// code to TQString and use TQString::findRev().
 	// We must throw away KviStr at all in this case...
 
-	// return TQString(m_ptr).tqfindRev(TQString(str),-1,caseS);
+	// return TQString(m_ptr).findRev(TQString(str),-1,caseS);
 
 	__range_valid(str);
 	//Calc the len of the searched string
@@ -2948,7 +2948,7 @@ KviStr & KviStr::emptyString()
 }
 
 
-bool KviStr::ext_tqcontains(register const char * data,const char * item,bool caseS)
+bool KviStr::ext_contains(register const char * data,const char * item,bool caseS)
 {
 	if(item && data)
 	{
diff --git a/src/kvilib/core/kvi_string.h b/src/kvilib/core/kvi_string.h
index 4a7991bb..4e9a3acb 100644
--- a/src/kvilib/core/kvi_string.h
+++ b/src/kvilib/core/kvi_string.h
@@ -376,9 +376,9 @@ public:
 	//=============================================================================
 
 	// Returns true if at least one occurence of str is found
-	bool tqcontains(const char *str,bool caseS=true) const;
+	bool contains(const char *str,bool caseS=true) const;
 	// Returns true if at least one occurence of character c is found in this string
-	bool tqcontains(char c,bool caseS=true) const;
+	bool contains(char c,bool caseS=true) const;
 	// Returns the number of occurences of string str in this string.<br>
 	// Overlapped matches are counted.
 	int occurences(const char *str,bool caseS=true) const;
@@ -405,9 +405,9 @@ public:
 	// str can NOT be 0 here.
 	int findLastIdx(const char *str,bool caseS = true) const;
 
-	int tqfind(char c,int startIdx) const;
-	int tqfind(const char * str,int startIdx,bool caseS = true) const;
-	int tqfindRev(const char * str,int startIdx,bool caseS = true) const;
+	int find(char c,int startIdx) const;
+	int find(const char * str,int startIdx,bool caseS = true) const;
+	int findRev(const char * str,int startIdx,bool caseS = true) const;
 
 	//=============================================================================
 	// Numbers
@@ -462,7 +462,7 @@ public:
 	//=============================================================================
 
 	// FIXME: Should it be KviStrExt::contains namespace ?
-	static bool ext_tqcontains(register const char * data,const char * item,bool caseS = true);
+	static bool ext_contains(register const char * data,const char * item,bool caseS = true);
 };
 
 // FIXME: the functions below should end in the KviStr namespace ???
diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp
index c0eb124e..fc14dfaf 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/kvi_config.cpp
@@ -80,7 +80,7 @@ void KviConfig::clearGroup(const TQString & szGroup)
 {
 	m_bDirty = true;
 	m_pDict->remove(szGroup);
-	if(!m_pDict->tqfind(m_szGroup))m_szGroup = KVI_CONFIG_DEFAULT_GROUP; //removed the current one
+	if(!m_pDict->find(m_szGroup))m_szGroup = KVI_CONFIG_DEFAULT_GROUP; //removed the current one
 }
 
 void KviConfig::clearKey(const TQString & szKey)
@@ -282,7 +282,7 @@ bool KviConfig::load()
 							TQString szGroup = m_bLocal8Bit ?
 								TQString::fromLocal8Bit(tmp.ptr(),tmp.len()) :
 								TQString::fromUtf8(tmp.ptr(),tmp.len());
-							p_group = m_pDict->tqfind(szGroup);
+							p_group = m_pDict->find(szGroup);
 							if(!p_group)
 							{
 								p_group = new KviConfigGroup(17,false);
@@ -324,13 +324,13 @@ bool KviConfig::load()
 									p_group->setAutoDelete(true);
 									m_pDict->insert(KVI_CONFIG_DEFAULT_GROUP,p_group);
 								}
-								p_group->tqreplace(szKey,pVal);
+								p_group->replace(szKey,pVal);
 							} else {
 								// we in fact need this (mercy :D)
 								// otherwise the empty options will be treated as non-existing ones
 								// and will get the defaults (which is bad)
 								TQString * pVal = new TQString(TQString());
-								p_group->tqreplace(szKey,pVal);
+								p_group->replace(szKey,pVal);
 							}
 						}
 					}
@@ -390,7 +390,7 @@ bool KviConfig::load()
 					if(dataLine.hasData())
 					{
 						TQString szUtf8 = TQString::fromUtf8(dataLine.ptr());
-						p_group = m_pDict->tqfind(szUtf8);
+						p_group = m_pDict->find(szUtf8);
 	
 						if(!p_group)
 						{
@@ -422,7 +422,7 @@ bool KviConfig::load()
 							m_pDict->insert(KVI_CONFIG_DEFAULT_GROUP,p_group);
 						}
 						TQString szName = TQString::fromUtf8(name.ptr());
-						p_group->tqreplace(szName,p_data);
+						p_group->replace(szName,p_data);
 					}
 				}
 				break;
@@ -550,18 +550,18 @@ void KviConfig::setGroup(const TQString & szGroup)
 bool KviConfig::hasKey(const TQString & szKey)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	return (p_group->tqfind(szKey) != 0);
+	return (p_group->find(szKey) != 0);
 }
 
 bool KviConfig::hasGroup(const TQString & szGroup)
 {
-	return (m_pDict->tqfind(szGroup) != 0);
+	return (m_pDict->find(szGroup) != 0);
 }
 
 KviConfigGroup * KviConfig::getCurrentGroup()
 {
 	if(m_szGroup.isEmpty())m_szGroup = KVI_CONFIG_DEFAULT_GROUP;
-	KviConfigGroup * p_group = m_pDict->tqfind(m_szGroup);
+	KviConfigGroup * p_group = m_pDict->find(m_szGroup);
 	if(!p_group)
 	{
 		//create the group
@@ -579,7 +579,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQString & szValue)
 	m_bDirty = true;
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data=new TQString(szValue);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 // FIXME: #warning "We have probs here ?"
@@ -587,7 +587,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQString & szValue)
 TQString KviConfig::readEntry(const TQString & szKey,const TQString & szDefault)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)
 	{
 		m_szStrBuffer = szDefault;
@@ -603,7 +603,7 @@ TQString KviConfig::readEntry(const TQString & szKey,const TQString & szDefault)
 TQString KviConfig::readTQStringEntry(const char *szKey,const TQString &szDefault)
 {
 	KviStrDict * p_group = getCurrentGroup();
-	KviStr * p_str = p_group->tqfind(szKey);
+	KviStr * p_str = p_group->find(szKey);
 	if(!p_str)return szDefault;
 	return TQString::fromUtf8(p_str->ptr());
 }
@@ -614,7 +614,7 @@ void KviConfig::writeEntry(const char *szKey,const TQString &szValue)
 {
 	m_bDirty = true;
 	KviStrDict * p_group = getCurrentGroup();
-	p_group->tqreplace(szKey,new KviStr(szValue.utf8().data()));
+	p_group->replace(szKey,new KviStr(szValue.utf8().data()));
 }
 */
 
@@ -625,7 +625,7 @@ static TQString g_szConfigStringListSeparator(",\\[ITEM],");
 TQStringList KviConfig::readStringListEntry(const TQString & szKey,const TQStringList &list)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return list;
 #ifdef COMPILE_USE_QT4
 	return p_str->split(g_szConfigStringListSeparator);
@@ -639,7 +639,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQStringList &list)
 	m_bDirty = true;
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data=new TQString(list.join(g_szConfigStringListSeparator));
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 ////////////////////////////////// KviValueList<int>
@@ -647,7 +647,7 @@ void KviConfig::writeEntry(const TQString & szKey,const TQStringList &list)
 KviValueList<int> KviConfig::readIntListEntry(const TQString & szKey,const KviValueList<int> &list)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)
 	{
 		//debug("Returning default list for group %s and key %s",m_szGroup.latin1(),szKey.latin1());
@@ -685,7 +685,7 @@ void KviConfig::writeEntry(const TQString & szKey,const KviValueList<int> &list)
 	}
 	//debug("Writing option list for group %s and key %s: %s",m_szGroup.latin1(),szKey.latin1(),szData.ptr());
 
-	p_group->tqreplace(szKey,new TQString(szData.ptr()));
+	p_group->replace(szKey,new TQString(szData.ptr()));
 }
 
 ////////////////////////////////// KviPixmap
@@ -698,13 +698,13 @@ void KviConfig::writeEntry(const TQString & szKey,const KviPixmap &pixmap)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data=new TQString();
 	KviStringConversion::toString(pixmap,*p_data);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 KviPixmap KviConfig::readPixmapEntry(const TQString & szKey,const KviPixmap &pixDef)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(p_str)
 	{
 		KviPixmap ret("");
@@ -722,13 +722,13 @@ void KviConfig::writeEntry(const TQString & szKey,const KviMsgType &msg)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString szData;
 	KviStringConversion::toString(msg,szData);
-	p_group->tqreplace(szKey,new TQString(szData));
+	p_group->replace(szKey,new TQString(szData));
 }
 
 KviMsgType KviConfig::readMsgTypeEntry(const TQString & szKey,const KviMsgType &msgDef)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return msgDef;
 	KviMsgType ret = msgDef;
 	KviStringConversion::fromString(*p_str,ret);
@@ -742,14 +742,14 @@ void KviConfig::writeEntry(const TQString & szKey,const TQColor &clr)
 	m_bDirty = true;
 	KviConfigGroup * p_group = getCurrentGroup();
 	KviStr szData(KviStr::Format,"%d,%d,%d",clr.red(),clr.green(),clr.blue());
-	p_group->tqreplace(szKey,new TQString(szData.ptr()));
+	p_group->replace(szKey,new TQString(szData.ptr()));
 }
 
 TQColor KviConfig::readColorEntry(const TQString & szKey,const TQColor &clr)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQColor color(clr);
-	TQString * pointer_that_IS_initialized = p_group->tqfind(szKey);
+	TQString * pointer_that_IS_initialized = p_group->find(szKey);
 
 
 	if(pointer_that_IS_initialized)
@@ -793,7 +793,7 @@ void KviConfig::writeEntry(const TQString & szKey,TQFont &fnt)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data = new TQString();
 	KviStringConversion::toString(fnt,*p_data);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 
@@ -806,7 +806,7 @@ TQFont KviConfig::readFontEntry(const TQString & szKey,const TQFont &fnt)
 {
 	TQFont font(fnt);
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str       = p_group->tqfind(szKey);
+	TQString * p_str       = p_group->find(szKey);
 	if(p_str)
 	{
 		//FontEntry=Arial,12,9,0,100,italic,underline,strikeout,
@@ -824,13 +824,13 @@ void KviConfig::writeEntry(const TQString & szKey,bool bTrue)
 	m_bDirty = true;
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data = new TQString(bTrue ? "true" : "false");
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 bool KviConfig::readBoolEntry(const TQString & szKey,bool bTrue)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return bTrue;
 	static TQString szTrue = "true";
 	return (KviTQString::toLower(*p_str) == szTrue);
@@ -844,13 +844,13 @@ void KviConfig::writeEntry(const TQString & szKey,const TQRect &rct)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString szBuf;
 	KviStringConversion::toString(rct,szBuf);
-	p_group->tqreplace(szKey,new TQString(szBuf));
+	p_group->replace(szKey,new TQString(szBuf));
 }
 
 TQRect KviConfig::readRectEntry(const TQString & szKey,const TQRect &rct)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * str = p_group->tqfind(szKey);
+	TQString * str = p_group->find(szKey);
 	if(!str)return rct;
 	TQRect ret;
 	return KviStringConversion::fromString(*str,ret) ? ret : rct;
@@ -864,13 +864,13 @@ void KviConfig::writeEntry(const TQString & szKey,unsigned short usValue)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data = new TQString();
 	p_data->setNum(usValue);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 unsigned short int KviConfig::readUShortEntry(const TQString & szKey,unsigned short int usDefault)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return usDefault;
 	bool bOk;
 	unsigned short int usVal=p_str->toUShort(&bOk);
@@ -887,13 +887,13 @@ void KviConfig::writeEntry(const char *szKey,unsigned long lValue)
 	KviStrDict * p_group = getCurrentGroup();
 	KviStr *p_data = new KviStr();
 	p_data->setNum(lValue);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 unsigned long KviConfig::readULongEntry(const char *szKey,unsigned long lDefault)
 {
 	KviStrDict * p_group = getCurrentGroup();
-	KviStr * p_str = p_group->tqfind(szKey);
+	KviStr * p_str = p_group->find(szKey);
 	if(!p_str)return lDefault;
 	bool bOk;
 	unsigned long lVal=p_str->toULong(&bOk);
@@ -909,13 +909,13 @@ void KviConfig::writeEntry(const TQString & szKey,int iValue)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data = new TQString();
 	p_data->setNum(iValue);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 int KviConfig::readIntEntry(const TQString & szKey,int iDefault)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
 	int iVal=p_str->toInt(&bOk);
@@ -930,13 +930,13 @@ void KviConfig::writeEntry(const TQString & szKey,unsigned int iValue)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data = new TQString();
 	p_data->setNum(iValue);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 unsigned int KviConfig::readUIntEntry(const TQString & szKey,unsigned int iDefault)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
 	unsigned int iVal=p_str->toUInt(&bOk);
@@ -951,13 +951,13 @@ void KviConfig::writeEntry(const TQString & szKey,char iValue)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString * p_data = new TQString();
 	p_data->setNum(iValue);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 char KviConfig::readCharEntry(const TQString & szKey,char iDefault)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
 	char iVal=(char)p_str->toInt(&bOk);
@@ -972,13 +972,13 @@ void KviConfig::writeEntry(const TQString & szKey,unsigned char iValue)
 	KviConfigGroup * p_group = getCurrentGroup();
 	TQString *p_data = new TQString();
 	p_data->setNum(iValue);
-	p_group->tqreplace(szKey,p_data);
+	p_group->replace(szKey,p_data);
 }
 
 unsigned char KviConfig::readUCharEntry(const TQString & szKey,unsigned char iDefault)
 {
 	KviConfigGroup * p_group = getCurrentGroup();
-	TQString * p_str = p_group->tqfind(szKey);
+	TQString * p_str = p_group->find(szKey);
 	if(!p_str)return iDefault;
 	bool bOk;
 	unsigned char iVal=(unsigned char)p_str->toUInt(&bOk);
diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp
index 52a747ae..959fe510 100644
--- a/src/kvilib/ext/kvi_crypt.cpp
+++ b/src/kvilib/ext/kvi_crypt.cpp
@@ -200,7 +200,7 @@
 
 	void KviCryptEngineManager::registerEngine(KviCryptEngineDescription * d)
 	{
-		m_pEngineDict->tqreplace(d->szName,d);
+		m_pEngineDict->replace(d->szName,d);
 	}
 
 	void KviCryptEngineManager::unregisterEngine(const TQString &szName)
@@ -222,7 +222,7 @@
 
 	KviCryptEngine * KviCryptEngineManager::allocateEngine(const TQString &szName)
 	{
-		KviCryptEngineDescription * d =  m_pEngineDict->tqfind(szName);
+		KviCryptEngineDescription * d =  m_pEngineDict->find(szName);
 		if(!d)return 0;
 		KviCryptEngine * e = d->allocFunc();
 		if(!e)return 0;
diff --git a/src/kvilib/ext/kvi_databuffer.cpp b/src/kvilib/ext/kvi_databuffer.cpp
index b0ca288c..7cad39c4 100644
--- a/src/kvilib/ext/kvi_databuffer.cpp
+++ b/src/kvilib/ext/kvi_databuffer.cpp
@@ -56,7 +56,7 @@ KviDataBuffer::~KviDataBuffer()
 	}
 }
 
-int KviDataBuffer::tqfind(const unsigned char * block,int uSize)
+int KviDataBuffer::find(const unsigned char * block,int uSize)
 {
 	if(uSize < 1)return -1;
 	if(uSize > m_uSize)return -1;
@@ -85,7 +85,7 @@ int KviDataBuffer::tqfind(const unsigned char * block,int uSize)
 	return -1;
 }
 
-int KviDataBuffer::tqfind(unsigned char c)
+int KviDataBuffer::find(unsigned char c)
 {
 	const unsigned char * p = m_pData;
 	const unsigned char * e = p + m_uSize;
diff --git a/src/kvilib/ext/kvi_databuffer.h b/src/kvilib/ext/kvi_databuffer.h
index 9fa7487b..62e09b06 100644
--- a/src/kvilib/ext/kvi_databuffer.h
+++ b/src/kvilib/ext/kvi_databuffer.h
@@ -49,8 +49,8 @@ public:
 	void addSize(int uSize){ resize(m_uSize + uSize); };
 	void append(const unsigned char * data,int uSize);
 	void append(const KviDataBuffer &b){ append(b.data(),b.size()); };
-	int tqfind(unsigned char c);
-	int tqfind(const unsigned char * block,int uSize);
+	int find(unsigned char c);
+	int find(const unsigned char * block,int uSize);
 };
 
 #endif //_KVI_DATABUFFER_H_
diff --git a/src/kvilib/ext/kvi_garbage.cpp b/src/kvilib/ext/kvi_garbage.cpp
index 10aacd26..fc4493a4 100644
--- a/src/kvilib/ext/kvi_garbage.cpp
+++ b/src/kvilib/ext/kvi_garbage.cpp
@@ -62,7 +62,7 @@ void KviGarbageCollector::garbageSuicide()
 		debug("Ops... garbage suicide while no garbage list");
 		return;
 	}
-	int idx = m_pGarbageList->tqfindRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
+	int idx = m_pGarbageList->findRef(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender())));
 	if(idx == -1)
 	{
 		debug("Ops... unregistered garbage suicide");
diff --git a/src/kvilib/ext/kvi_imagelib.h b/src/kvilib/ext/kvi_imagelib.h
index 1bbccb1b..539e5a9a 100644
--- a/src/kvilib/ext/kvi_imagelib.h
+++ b/src/kvilib/ext/kvi_imagelib.h
@@ -25,7 +25,7 @@
 
 //
 // A class to manage multiple image libraries.
-// The library is in fact a big image that tqcontains
+// The library is in fact a big image that contains
 // several rows of other smaller images of the same size.
 // The images inside the 'library' are indexed in the following way:
 //
diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index 4601e6bd..d7adeb2e 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -165,7 +165,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 			} // else the current has no wildcards...skip
 		} else {
 			// the new tqmask has no wildcards....
-			if(mt->szFileMask.tqcontains('*'))
+			if(mt->szFileMask.contains('*'))
 			{
 				// current one has wildcards...insert
 				m_pMediaTypeList->insert(index,m);
@@ -188,7 +188,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 	// the masks with no wildcards go first
 	// longer masks go first
 
-	bool bHasWildcards = m->szFileMask.tqcontains('*');
+	bool bHasWildcards = m->szFileMask.contains('*');
 	int index = 0;
 	for(KviMediaType * mt = m_pMediaTypeList->first();mt;mt = m_pMediaTypeList->next())
 	{
@@ -207,7 +207,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 				}
 			}
 		} else {
-			if(mt->szFileMask.tqcontains('*'))
+			if(mt->szFileMask.contains('*'))
 			{
 				m_pMediaTypeList->insert(index,m);
 				return;
diff --git a/src/kvilib/ext/kvi_regchan.cpp b/src/kvilib/ext/kvi_regchan.cpp
index d5eff0a3..434ebd9f 100644
--- a/src/kvilib/ext/kvi_regchan.cpp
+++ b/src/kvilib/ext/kvi_regchan.cpp
@@ -99,9 +99,9 @@ void KviRegisteredChannelDataBase::save(const char * filename)
 	}
 }
 
-KviRegisteredChannel * KviRegisteredChannelDataBase::tqfind(const char * name,const char * net)
+KviRegisteredChannel * KviRegisteredChannelDataBase::find(const char * name,const char * net)
 {
-	KviRegisteredChannelList * l = m_pChannelDict->tqfind(name);
+	KviRegisteredChannelList * l = m_pChannelDict->find(name);
 	if(!l)return 0;
 	for(KviRegisteredChannel * c = l->first();c;c = l->next())
 	{
@@ -113,7 +113,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::tqfind(const char * name,co
 
 KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name,const char * nettqmask)
 {
-	KviRegisteredChannelList * l = m_pChannelDict->tqfind(name);
+	KviRegisteredChannelList * l = m_pChannelDict->find(name);
 	if(!l)return 0;
 	for(KviRegisteredChannel * c = l->first();c;c = l->next())
 	{
@@ -124,7 +124,7 @@ KviRegisteredChannel * KviRegisteredChannelDataBase::findExact(const char * name
 
 void KviRegisteredChannelDataBase::remove(KviRegisteredChannel * c)
 {
-	KviRegisteredChannelList * l = m_pChannelDict->tqfind(c->name().ptr());
+	KviRegisteredChannelList * l = m_pChannelDict->find(c->name().ptr());
 	if(!l)return;
 	for(KviRegisteredChannel * ch = l->first();ch;ch = l->next())
 	{
@@ -156,7 +156,7 @@ void KviRegisteredChannelDataBase::add(KviRegisteredChannel * c)
 		}
 		remove(old);
 	}
-	KviRegisteredChannelList * l = m_pChannelDict->tqfind(c->name().ptr());
+	KviRegisteredChannelList * l = m_pChannelDict->find(c->name().ptr());
 	if(!l)
 	{
 		l = new KviRegisteredChannelList;
diff --git a/src/kvilib/ext/kvi_regchan.h b/src/kvilib/ext/kvi_regchan.h
index 65393918..5cdad198 100644
--- a/src/kvilib/ext/kvi_regchan.h
+++ b/src/kvilib/ext/kvi_regchan.h
@@ -45,9 +45,9 @@ public:
 	KviPointerHashTable<const char *,KviStr> * propertyDict(){ return m_pPropertyDict; };
 	const KviStr & name(){ return m_szName; };
 	const KviStr & netMask(){ return m_szNetMask; };
-	KviStr * property(const char * name){ return m_pPropertyDict->tqfind(name); };
+	KviStr * property(const char * name){ return m_pPropertyDict->find(name); };
 	// val must be allocated with NEW!
-	void setProperty(const char * name,KviStr * val){ m_pPropertyDict->tqreplace(name,val); };
+	void setProperty(const char * name,KviStr * val){ m_pPropertyDict->replace(name,val); };
 	void removeProperty(const char * name){ m_pPropertyDict->remove(name); };
 };
 
@@ -62,7 +62,7 @@ protected:
 	KviPointerHashTable<const char *,KviRegisteredChannelList> * m_pChannelDict;
 public:
 	KviPointerHashTable<const char *,KviRegisteredChannelList> * channelDict(){ return m_pChannelDict; };
-	KviRegisteredChannel * tqfind(const char * name,const char * net);
+	KviRegisteredChannel * find(const char * name,const char * net);
 	KviRegisteredChannel * findExact(const char * name,const char * nettqmask);
 	void remove(KviRegisteredChannel * c);
 	void add(KviRegisteredChannel * c);
diff --git a/src/kvilib/ext/kvi_regusersdb.cpp b/src/kvilib/ext/kvi_regusersdb.cpp
index 0a0c632a..6145d0ba 100644
--- a/src/kvilib/ext/kvi_regusersdb.cpp
+++ b/src/kvilib/ext/kvi_regusersdb.cpp
@@ -237,7 +237,7 @@ void KviRegisteredUser::setProperty(const TQString & name,const TQString & value
 #endif
 		if(!val->isEmpty())
 		{
-			m_pPropertyDict->tqreplace(name,val);
+			m_pPropertyDict->replace(name,val);
 		} else {
 			delete val;
             val = 0;
@@ -251,7 +251,7 @@ bool KviRegisteredUser::getProperty(const TQString & name,TQString &value)
 {
 	if(!m_pPropertyDict)return false;
 	if(name.isEmpty()) return false;
-	TQString * pValue = m_pPropertyDict->tqfind(name);
+	TQString * pValue = m_pPropertyDict->find(name);
 	if(pValue)value = *pValue;
 	else return false;
 	return true;
@@ -261,7 +261,7 @@ const TQString & KviRegisteredUser::getProperty(const TQString & name)
 {
 	if(!m_pPropertyDict)return KviTQString::empty;
 	if(name.isEmpty())return KviTQString::empty;
-	TQString * pValue = m_pPropertyDict->tqfind(name);
+	TQString * pValue = m_pPropertyDict->find(name);
 	if(pValue)return *pValue;
 	return KviTQString::empty;
 }
@@ -270,7 +270,7 @@ bool KviRegisteredUser::getBoolProperty(const TQString & name,bool def)
 {
 	if(!m_pPropertyDict)return def;
 	if(name.isEmpty()) return def;
-	TQString * pValue = m_pPropertyDict->tqfind(name);
+	TQString * pValue = m_pPropertyDict->find(name);
 	if(pValue)
 	{
 		// be flexible , allow more "true" values (pragma)
@@ -331,9 +331,9 @@ KviRegisteredUserDataBase::~KviRegisteredUserDataBase()
 KviRegisteredUser * KviRegisteredUserDataBase::addUser(const TQString & name)
 {
 	if(name.isEmpty()) return false;
-	if(m_pUserDict->tqfind(name))return 0;
+	if(m_pUserDict->find(name))return 0;
 	KviRegisteredUser * u = new KviRegisteredUser(name);
-	m_pUserDict->tqreplace(u->name(),u); //u->name() because we're NOT copying keys!
+	m_pUserDict->replace(u->name(),u); //u->name() because we're NOT copying keys!
 	emit(userAdded(name));
 	return u;
 }
@@ -341,20 +341,20 @@ KviRegisteredUser * KviRegisteredUserDataBase::addUser(const TQString & name)
 KviRegisteredUserGroup * KviRegisteredUserDataBase::addGroup(const TQString & name)
 {
 	if(name.isEmpty()) return false;
-	if(m_pGroupDict->tqfind(name))return 0;
+	if(m_pGroupDict->find(name))return 0;
 	KviRegisteredUserGroup * pGroup = new KviRegisteredUserGroup(name);
-	m_pGroupDict->tqreplace(pGroup->name(),pGroup); //u->name() because we're NOT copying keys!
+	m_pGroupDict->replace(pGroup->name(),pGroup); //u->name() because we're NOT copying keys!
 	return pGroup;
 }
 
 KviRegisteredUser * KviRegisteredUserDataBase::getUser(const TQString & name)
 {
 	if(name.isEmpty()) return 0;
-	KviRegisteredUser * u = m_pUserDict->tqfind(name);
+	KviRegisteredUser * u = m_pUserDict->find(name);
 	if(!u)
 	{
 		u = new KviRegisteredUser(name);
-		m_pUserDict->tqreplace(u->name(),u); //u->name() because we're NOT copying keys!
+		m_pUserDict->replace(u->name(),u); //u->name() because we're NOT copying keys!
 	}
 	return u;
 }
@@ -378,7 +378,7 @@ static void append_mask_to_list(KviRegisteredMaskList *l,KviRegisteredUser *u,Kv
 KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,KviIrcMask * tqmask)
 {
 	if(!u || !tqmask) return 0;
-	__range_valid(u == m_pUserDict->tqfind(u->name()));
+	__range_valid(u == m_pUserDict->find(u->name()));
 
 	KviRegisteredMaskList * l;
 	if(tqmask->hasWildNick())
@@ -396,7 +396,7 @@ KviRegisteredUser * KviRegisteredUserDataBase::addMask(KviRegisteredUser * u,Kvi
 		// masks with more info go first in the list
 		l = m_pWildMaskList;
 	} else {
-		l = m_pMaskDict->tqfind(tqmask->nick());
+		l = m_pMaskDict->find(tqmask->nick());
 		if(l)
 		{
 			// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
@@ -486,7 +486,7 @@ void KviRegisteredUserDataBase::copyFrom(KviRegisteredUserDataBase * db)
 bool KviRegisteredUserDataBase::removeUser(const TQString & name)
 {
 	if(name.isEmpty()) return false;
-	KviRegisteredUser * u = m_pUserDict->tqfind(name);
+	KviRegisteredUser * u = m_pUserDict->find(name);
 	if(!u)return false;
 	while(KviIrcMask * tqmask = u->maskList()->first())
 	{
@@ -537,7 +537,7 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
 		}
 		// not found ...opz :)
 	} else {
-		KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask->nick());
+		KviRegisteredMaskList * l = m_pMaskDict->find(tqmask->nick());
 		if(l)
 		{
 			// FIXME: #warning "Here we could compare the host and username only: nick matches for sure"
@@ -566,7 +566,7 @@ bool KviRegisteredUserDataBase::removeMaskByPointer(KviIrcMask * tqmask)
 KviRegisteredUser * KviRegisteredUserDataBase::findMatchingUser(const KviIrcMask &tqmask)
 {
 	// first lookup the nickname in the maskDict
-	KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask.nick());
+	KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
 	if(l)
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
@@ -593,7 +593,7 @@ KviRegisteredMask * KviRegisteredUserDataBase::findMatchingMask(const TQString &
 {
 	// first lookup the nickname in the maskDict
 	if(nick.isEmpty()) return false;
-	KviRegisteredMaskList * l = m_pMaskDict->tqfind(nick);
+	KviRegisteredMaskList * l = m_pMaskDict->find(nick);
 	if(l)
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
@@ -620,7 +620,7 @@ KviRegisteredMask * KviRegisteredUserDataBase::findExactMask(const KviIrcMask &t
 {
 	// first lookup the nickname in the maskDict
 	if(tqmask.nick()=="") return 0;
-	KviRegisteredMaskList * l = m_pMaskDict->tqfind(tqmask.nick());
+	KviRegisteredMaskList * l = m_pMaskDict->find(tqmask.nick());
 	if(l)
 	{
 		for(KviRegisteredMask *m = l->first();m;m = l->next())
@@ -686,7 +686,7 @@ void KviRegisteredUserDataBase::load(const TQString & filename)
 		}
 		++it;
 	}
-	if(!m_pGroupDict->tqfind(__tr("Default")))
+	if(!m_pGroupDict->find(__tr("Default")))
 		addGroup(__tr("Default"));
 }
 
diff --git a/src/kvilib/ext/kvi_regusersdb.h b/src/kvilib/ext/kvi_regusersdb.h
index 78e193de..797ae101 100644
--- a/src/kvilib/ext/kvi_regusersdb.h
+++ b/src/kvilib/ext/kvi_regusersdb.h
@@ -172,7 +172,7 @@ public:
 	KviRegisteredUser * getUser(const TQString &name); // returns existing or adds
 	bool removeUser(const TQString &name);
 	bool removeGroup(const TQString &name);
-	KviRegisteredUser * findUserByName(const TQString &name){ return m_pUserDict->tqfind(name); };
+	KviRegisteredUser * findUserByName(const TQString &name){ return m_pUserDict->find(name); };
 	// tqmask must be allocated on the heap and the ownership is transferred!
 	// returns non zero if there is already an user with this tqmask (returns the pointer to it!)
 	KviRegisteredUser * addMask(KviRegisteredUser * u,KviIrcMask * tqmask);
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index 9383f695..0e793a34 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -87,10 +87,10 @@ KviSharedFile::KviSharedFile(const TQString &szName,const TQString &szAbsPath,co
 	m_expireTime = expireTime;
 	m_uFileSize = uFileSize;
 #ifdef COMPILE_USE_QT4
-	// QT4ROX: Because they have finally moved the functionality of TQString::tqcontains() to TQString::count(), and TQString::tqcontains() now does the right job
+	// QT4ROX: Because they have finally moved the functionality of TQString::contains() to TQString::count(), and TQString::contains() now does the right job
 	m_uWildCount = m_szUserMask.count('*');
 #else
-	m_uWildCount = m_szUserMask.tqcontains('*');
+	m_uWildCount = m_szUserMask.contains('*');
 #endif
 	m_uNonWildCount = m_szUserMask.length() - m_uWildCount;
 }
@@ -224,12 +224,12 @@ void KviSharedFilesManager::doInsert(KviSharedFileList * l, KviSharedFile * o)
 void KviSharedFilesManager::addSharedFile(KviSharedFile * f)
 {
 	// First find the list
-	KviSharedFileList * l = m_pSharedListDict->tqfind(f->name());
+	KviSharedFileList * l = m_pSharedListDict->find(f->name());
 	if(!l)
 	{
 		l = new KviSharedFileList;
 		l->setAutoDelete(true);
-		m_pSharedListDict->tqreplace(f->name(),l);
+		m_pSharedListDict->replace(f->name(),l);
 	}
 	
 	doInsert(l,f);
@@ -248,12 +248,12 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
 	if(inf.exists() && inf.isFile() && inf.isReadable() && (inf.size() > 0))
 	{
 		// First find the list
-		KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+		KviSharedFileList * l = m_pSharedListDict->find(szName);
 		if(!l)
 		{
 			l = new KviSharedFileList;
 			l->setAutoDelete(true);
-			m_pSharedListDict->tqreplace(szName,l);
+			m_pSharedListDict->replace(szName,l);
 		}
 	
 		// Now insert
@@ -277,7 +277,7 @@ KviSharedFile * KviSharedFilesManager::addSharedFile(const TQString &szName,cons
 
 KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,KviIrcMask * tqmask,unsigned int uFileSize)
 {
-	KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+	KviSharedFileList * l = m_pSharedListDict->find(szName);
 	if(!l)return 0;
 
 	for(KviSharedFile * o = l->first();o;o = l->next())
@@ -301,7 +301,7 @@ KviSharedFile * KviSharedFilesManager::lookupSharedFile(const TQString &szName,K
 }
 bool KviSharedFilesManager::removeSharedFile(const TQString &szName,const TQString &szMask,unsigned int uFileSize)
 {
-	KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+	KviSharedFileList * l = m_pSharedListDict->find(szName);
 	if(!l)return false;
 	for(KviSharedFile * o = l->first();o;o = l->next())
 	{
@@ -323,7 +323,7 @@ bool KviSharedFilesManager::removeSharedFile(const TQString &szName,const TQStri
 
 bool KviSharedFilesManager::removeSharedFile(const TQString &szName,KviSharedFile * off)
 {
-	KviSharedFileList * l = m_pSharedListDict->tqfind(szName);
+	KviSharedFileList * l = m_pSharedListDict->find(szName);
 	if(!l)return false;
 	for(KviSharedFile * o = l->first();o;o = l->next())
 	{
diff --git a/src/kvilib/ext/kvi_stringconversion.cpp b/src/kvilib/ext/kvi_stringconversion.cpp
index accba786..2836628c 100644
--- a/src/kvilib/ext/kvi_stringconversion.cpp
+++ b/src/kvilib/ext/kvi_stringconversion.cpp
@@ -49,7 +49,7 @@ namespace KviStringConversion
 		{
 			if(!g_szLocalDir.isEmpty())
 			{
-				if(KviTQString::tqfind(buffer,g_szLocalDir)==0)
+				if(KviTQString::find(buffer,g_szLocalDir)==0)
 				{
 					buffer.remove(0,g_szLocalDir.length());
 					buffer.prepend("local://");
@@ -57,7 +57,7 @@ namespace KviStringConversion
 			}
 			if(!g_szGlobalDir.isEmpty())
 			{
-				if(KviTQString::tqfind(buffer,g_szGlobalDir)==0)
+				if(KviTQString::find(buffer,g_szGlobalDir)==0)
 				{
 					buffer.remove(0,g_szGlobalDir.length());
 					buffer.prepend("global://");
@@ -72,7 +72,7 @@ namespace KviStringConversion
 		{
 			if(!g_szLocalDir.isEmpty())
 			{
-				if(KviTQString::tqfind(buffer,"local://")==0)
+				if(KviTQString::find(buffer,"local://")==0)
 				{
 					buffer.remove(0,8);
 					buffer.prepend(g_szLocalDir);
@@ -80,7 +80,7 @@ namespace KviStringConversion
 			}
 			if(!g_szGlobalDir.isEmpty())
 			{
-				if(KviTQString::tqfind(buffer,"global://")==0)
+				if(KviTQString::find(buffer,"global://")==0)
 				{
 					buffer.remove(0,9);
 					buffer.prepend(g_szGlobalDir);
@@ -250,11 +250,11 @@ namespace KviStringConversion
 		if(bOk && (i >= 0))buffer.setWeight(i);
 		if(!str.isEmpty())
 		{
-			buffer.setBold(str.tqcontains("b"));
-			buffer.setItalic(str.tqcontains("i"));
-			buffer.setUnderline(str.tqcontains("u"));
-			buffer.setStrikeOut(str.tqcontains("s"));
-			buffer.setFixedPitch(str.tqcontains("f"));
+			buffer.setBold(str.contains("b"));
+			buffer.setItalic(str.contains("i"));
+			buffer.setUnderline(str.contains("u"));
+			buffer.setStrikeOut(str.contains("s"));
+			buffer.setFixedPitch(str.contains("f"));
 		}
 		return true;
 	}
diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp
index 1ad09d60..1668999d 100644
--- a/src/kvilib/file/kvi_fileutils.cpp
+++ b/src/kvilib/file/kvi_fileutils.cpp
@@ -108,7 +108,7 @@ namespace KviFileUtils
 #ifdef COMPILE_USE_QT4
 		int idx = dir.indexOf(':');
 #else
-		int idx = dir.tqfind(':');
+		int idx = dir.find(':');
 #endif
 		if(idx == 1)
 		{
@@ -212,20 +212,20 @@ namespace KviFileUtils
 	void adjustFilePath(TQString &szPath)
 	{
 #ifdef COMPILE_ON_WINDOWS
-		szPath.tqreplace('/',"\\");
+		szPath.replace('/',"\\");
 #ifdef COMPILE_USE_QT4
-		szPath.tqreplace("\\\\","\\");
+		szPath.replace("\\\\","\\");
 #else
-		while(szPath.tqfind("\\\\") != -1)szPath.tqreplace("\\\\","\\");
+		while(szPath.find("\\\\") != -1)szPath.replace("\\\\","\\");
 #endif
 		// FIXME: Use the default drive here ?
 		if(szPath.startsWith("\\"))szPath.prepend("C:");
 #else
-		szPath.tqreplace('\\',"/");
+		szPath.replace('\\',"/");
 #ifdef COMPILE_USE_QT4
-		szPath.tqreplace("//","/");
+		szPath.replace("//","/");
 #else
-		while(KviTQString::tqfind(szPath,"//") != -1)szPath.tqreplace("//","/");
+		while(KviTQString::find(szPath,"//") != -1)szPath.replace("//","/");
 #endif
 		// deal with windows paths
 		if((szPath.length() > 2) && (szPath.at(0) != TQChar('/')))
diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/kvi_packagefile.cpp
index 5700f4e8..fa3a91d4 100644
--- a/src/kvilib/file/kvi_packagefile.cpp
+++ b/src/kvilib/file/kvi_packagefile.cpp
@@ -196,12 +196,12 @@ KviPackageWriter::~KviPackageWriter()
 
 void KviPackageWriter::addInfoField(const TQString &szName,const TQString &szValue)
 {
-	m_pStringInfoFields->tqreplace(szName,new TQString(szValue));
+	m_pStringInfoFields->replace(szName,new TQString(szValue));
 }
 
 void KviPackageWriter::addInfoField(const TQString &szName,TQByteArray * pValue)
 {
-	m_pBinaryInfoFields->tqreplace(szName,pValue);
+	m_pBinaryInfoFields->replace(szName,pValue);
 }
 
 bool KviPackageWriter::addFile(const TQString &szLocalFileName,const TQString &szTargetFileName,kvi_u32_t uAddFileFlags)
@@ -696,7 +696,7 @@ bool KviPackageReader::readHeaderInternal(KviFile * pFile,const TQString &szLoca
 			{
 				TQString szValue;
 				if(!pFile->load(szValue))return readError();
-				m_pStringInfoFields->tqreplace(szKey,new TQString(szValue));
+				m_pStringInfoFields->replace(szKey,new TQString(szValue));
 			}
 			break;
 			case KVI_PACKAGE_INFOFIELD_TYPE_BINARYBUFFER:
@@ -707,7 +707,7 @@ bool KviPackageReader::readHeaderInternal(KviFile * pFile,const TQString &szLoca
 					delete pbValue;
 					return readError();
 				}
-				m_pBinaryInfoFields->tqreplace(szKey,pbValue);
+				m_pBinaryInfoFields->replace(szKey,pbValue);
 			}
 			break;
 			default:
@@ -757,12 +757,12 @@ bool KviPackageReader::unpackFile(KviFile * pFile,const TQString &szUnpackPath)
 	szFileName += szPath;
 
 	// no attacks please :)
-	szFileName.tqreplace(TQString("..\\"),TQString(""));
-	szFileName.tqreplace(TQString("..//"),TQString(""));
+	szFileName.replace(TQString("..\\"),TQString(""));
+	szFileName.replace(TQString("..//"),TQString(""));
 	
 	KviFileUtils::adjustFilePath(szFileName);
 
-	int idx = KviTQString::tqfindRev(szFileName,TQChar(KVI_PATH_SEPARATOR_CHAR));
+	int idx = KviTQString::findRev(szFileName,TQChar(KVI_PATH_SEPARATOR_CHAR));
 	if(idx != -1)
 	{
 		TQString szPrefixPath = szFileName.left(idx);
@@ -960,7 +960,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile,const TQString &szUnpackPath)
 
 bool KviPackageReader::getStringInfoField(const TQString &szName,TQString &szBuffer)
 {
-	TQString * pVal = m_pStringInfoFields->tqfind(szName);
+	TQString * pVal = m_pStringInfoFields->find(szName);
 	if(!pVal)return false;
 	szBuffer = *pVal;
 	return true;
diff --git a/src/kvilib/irc/kvi_avatar.h b/src/kvilib/irc/kvi_avatar.h
index fddecf4d..82754d08 100644
--- a/src/kvilib/irc/kvi_avatar.h
+++ b/src/kvilib/irc/kvi_avatar.h
@@ -76,7 +76,7 @@ public:
 	//        ex: /home/pragma/.kvirc/avatars/pragma.png
 	
 	// local path->name : strip leading path informations
-	// name->local path : tqreplace : / and
+	// name->local path : replace : / and
 
 };
 
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/kvi_avatarcache.cpp
index 59c0ed61..57ab53f5 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/kvi_avatarcache.cpp
@@ -76,7 +76,7 @@ KviAvatarCache::~KviAvatarCache()
 }
 
 
-void KviAvatarCache::tqreplace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork)
+void KviAvatarCache::replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork)
 {
 	TQString szKey;
 
@@ -88,7 +88,7 @@ void KviAvatarCache::tqreplace(const TQString &szIdString,const KviIrcMask &tqma
 	e->szIdString = szIdString;
 	e->tLastAccess = kvi_unixTime();
 	
-	m_pAvatarDict->tqreplace(szKey,e);
+	m_pAvatarDict->replace(szKey,e);
 	
 	if(m_pAvatarDict->count() > MAX_AVATARS_IN_CACHE)
 	{
@@ -117,7 +117,7 @@ const TQString & KviAvatarCache::lookup(const KviIrcMask &tqmask,const TQString
 	szKey.append(TQChar('+'));
 	szKey.append(szNetwork);
 
-	KviAvatarCacheEntry * e = m_pAvatarDict->tqfind(szKey);
+	KviAvatarCacheEntry * e = m_pAvatarDict->find(szKey);
 	if(!e)return KviTQString::empty;
 	e->tLastAccess = kvi_unixTime();
 	return e->szIdString;
@@ -149,7 +149,7 @@ void KviAvatarCache::load(const TQString &szFileName)
 				KviAvatarCacheEntry * e = new KviAvatarCacheEntry;
 				e->tLastAccess = tLastAccess;
 				e->szIdString = szIdString;
-				m_pAvatarDict->tqreplace(it.currentKey(),e);
+				m_pAvatarDict->replace(it.currentKey(),e);
 				cnt++;
 				if(cnt >= MAX_AVATARS_IN_CACHE)return; // done
 			}
diff --git a/src/kvilib/irc/kvi_avatarcache.h b/src/kvilib/irc/kvi_avatarcache.h
index 7f2ff822..c245c3bc 100644
--- a/src/kvilib/irc/kvi_avatarcache.h
+++ b/src/kvilib/irc/kvi_avatarcache.h
@@ -55,7 +55,7 @@ public:
 	
 	static KviAvatarCache * instance(){ return m_pAvatarCacheInstance; };
 
-	void tqreplace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork);
+	void replace(const TQString &szIdString,const KviIrcMask &tqmask,const TQString &szNetwork);
 	void remove(const KviIrcMask &tqmask,const TQString &szNetwork);
 	const TQString & lookup(const KviIrcMask &tqmask,const TQString &szNetwork);
 	
diff --git a/src/kvilib/irc/kvi_ircmask.cpp b/src/kvilib/irc/kvi_ircmask.cpp
index cb90c009..d18e398d 100644
--- a/src/kvilib/irc/kvi_ircmask.cpp
+++ b/src/kvilib/irc/kvi_ircmask.cpp
@@ -60,7 +60,7 @@
 		+: i line with ident[br]
 		=: i line with OTHER type ident[br]
 		-: i line, no ident[br]
-		So finally you can tqfind <username> strings like "~pragma" or "^pragma", where "pragma"
+		So finally you can find <username> strings like "~pragma" or "^pragma", where "pragma"
 		is the system username of the irc-user and ~ and ^ are prefixes.[br]
 		The <host> part is the hostname of the remote user.[br]
 		In most cases it is the human-readable format of the host name, but sometimes
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index 172da1f6..84bb5f39 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -69,7 +69,7 @@ KviIrcServer * KviIrcServerDataBaseRecord::findServer(const KviIrcServer * pServ
 
 void KviIrcServerDataBaseRecord::setCurrentServer(KviIrcServer *srv)
 {
-	if(m_pServerList->tqfindRef(srv) != -1)m_pCurrentServer = srv;
+	if(m_pServerList->findRef(srv) != -1)m_pCurrentServer = srv;
 }
 
 KviIrcServer * KviIrcServerDataBaseRecord::currentServer()
@@ -126,19 +126,19 @@ void KviIrcServerDataBase::clear()
 KviIrcServerDataBaseRecord * KviIrcServerDataBase::insertNetwork(KviIrcNetwork *n)
 {
 	KviIrcServerDataBaseRecord * r = new KviIrcServerDataBaseRecord(n);
-	m_pRecords->tqreplace(n->name(),r);
+	m_pRecords->replace(n->name(),r);
 	return r;
 }
 
 KviIrcServerDataBaseRecord * KviIrcServerDataBase::findRecord(const TQString &szNetName)
 {
-	return m_pRecords->tqfind(szNetName);
+	return m_pRecords->find(szNetName);
 }
 
 
 KviIrcNetwork * KviIrcServerDataBase::findNetwork(const TQString &szName)
 {
-	KviIrcServerDataBaseRecord * r = m_pRecords->tqfind(szName);
+	KviIrcServerDataBaseRecord * r = m_pRecords->find(szName);
 	if(!r)return 0;
 	return r->network();
 }
@@ -146,7 +146,7 @@ KviIrcNetwork * KviIrcServerDataBase::findNetwork(const TQString &szName)
 KviIrcServerDataBaseRecord * KviIrcServerDataBase::currentRecord()
 {
 	KviIrcServerDataBaseRecord * r = 0;
-	if(!m_szCurrentNetwork.isEmpty())r = m_pRecords->tqfind(m_szCurrentNetwork);
+	if(!m_szCurrentNetwork.isEmpty())r = m_pRecords->find(m_szCurrentNetwork);
 	if(r)return r;
 
 	KviPointerHashTableIterator<TQString,KviIrcServerDataBaseRecord> it(*m_pRecords);
@@ -185,11 +185,11 @@ bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const TQString &szNetN
 	for(KviIrcServer * s = r->m_pServerList->first();s;s = r->m_pServerList->next())
 	{
 #ifdef COMPILE_USE_QT4
-		if(s->m_szDescription.tqcontains("random",TQt::CaseInsensitive) ||
-			(s->m_szDescription.tqcontains("round",TQt::CaseInsensitive) && s->m_szDescription.tqcontains("robin",TQt::CaseInsensitive)))
+		if(s->m_szDescription.contains("random",TQt::CaseInsensitive) ||
+			(s->m_szDescription.contains("round",TQt::CaseInsensitive) && s->m_szDescription.contains("robin",TQt::CaseInsensitive)))
 #else
-		if(s->m_szDescription.tqcontains("random",false) ||
-			(s->m_szDescription.tqcontains("round",false) && s->m_szDescription.tqcontains("robin",false)))
+		if(s->m_szDescription.contains("random",false) ||
+			(s->m_szDescription.contains("round",false) && s->m_szDescription.contains("robin",false)))
 #endif
 		{
 			r->setCurrentServer(s);
@@ -234,7 +234,7 @@ bool KviIrcServerDataBase::makeCurrentServer(KviIrcServerDefinition * d,TQString
 		// net:networkname form
 		TQString szNet = d->szServer;
 		szNet.remove(0,4);
-		KviIrcServerDataBaseRecord * r = m_pRecords->tqfind(szNet);
+		KviIrcServerDataBaseRecord * r = m_pRecords->find(szNet);
 		if(r)return makeCurrentBestServerInNetwork(szNet,r,szError);
 		szError = __tr2qs("The server specification seems to be in the net:<string> but the network couln't be found in the database");
 		return false;
@@ -344,13 +344,13 @@ search_finished:
 	{
 		// is it a valid hostname ? (must contain at least one dot)
 #ifdef COMPILE_USE_QT4
-		if(!d->szServer.tqcontains('.'))
+		if(!d->szServer.contains('.'))
 #else
-		if(d->szServer.tqcontains('.') < 1)
+		if(d->szServer.contains('.') < 1)
 #endif
 		{
 			// assume it is a network name!
-			KviIrcServerDataBaseRecord * r = m_pRecords->tqfind(d->szServer);
+			KviIrcServerDataBaseRecord * r = m_pRecords->find(d->szServer);
 			if(r)return makeCurrentBestServerInNetwork(d->szServer,r,szError);
 			// else probably not a network name
 		}
@@ -358,11 +358,11 @@ search_finished:
 
 	// a valid hostname or ip address , not found in list : add it and make it current
 
-	r = m_pRecords->tqfind(__tr2qs("Standalone Servers"));
+	r = m_pRecords->find(__tr2qs("Standalone Servers"));
 	if(!r)
 	{
 		r = new KviIrcServerDataBaseRecord(new KviIrcNetwork(__tr2qs("Standalone Servers")));
-		m_pRecords->tqreplace(r->network()->name(),r);
+		m_pRecords->replace(r->network()->name(),r);
 	}
 
 	KviIrcServer * s = new KviIrcServer();
@@ -401,7 +401,7 @@ void parseMircServerRecord(TQString entry,TQString& szNet,
 						   TQString& szDescription,TQString& szHost,TQString& szPort,bool& bSsl,kvi_u32_t& uPort)
 {
 	bSsl = false;
-	int idx = KviTQString::tqfind(entry,"SERVER:");
+	int idx = KviTQString::find(entry,"SERVER:");
 	if(idx != -1)
 	{
 		szDescription = entry.left(idx);
@@ -409,7 +409,7 @@ void parseMircServerRecord(TQString entry,TQString& szNet,
 		szDescription=szDescription.section(':',1,1);
 
 		entry.remove(0,idx + 7);
-		idx = KviTQString::tqfind(entry,"GROUP:");
+		idx = KviTQString::find(entry,"GROUP:");
 		if(idx != -1)
 		{
 			szHost = entry.left(idx);
diff --git a/src/kvilib/irc/kvi_ircuserdb.cpp b/src/kvilib/irc/kvi_ircuserdb.cpp
index bfc1c615..7fda2d12 100644
--- a/src/kvilib/irc/kvi_ircuserdb.cpp
+++ b/src/kvilib/irc/kvi_ircuserdb.cpp
@@ -114,7 +114,7 @@ KviIrcUserDataBase::~KviIrcUserDataBase()
 
 bool KviIrcUserDataBase::haveCustomColor(const TQString & nick)
 {
-	KviIrcUserEntry *u = tqfind(nick);
+	KviIrcUserEntry *u = find(nick);
 	if(!u) return false;
 	if( u->m_szLastRegisteredMatchNick!=nick)
 		registeredUser(nick);
@@ -127,7 +127,7 @@ bool KviIrcUserDataBase::haveCustomColor(const TQString & nick)
 
 TQColor* KviIrcUserDataBase::customColor(const TQString & nick)
 {
-	KviIrcUserEntry *u = tqfind(nick);
+	KviIrcUserEntry *u = find(nick);
 	if(!u) return 0;
 	if( u->m_szLastRegisteredMatchNick!=nick)
 		registeredUser(nick);
@@ -143,7 +143,7 @@ TQColor* KviIrcUserDataBase::customColor(const TQString & nick)
 KviRegisteredUser* KviIrcUserDataBase::registeredUser(const TQString & nick,const TQString & user,const TQString & host)
 {
 	if(nick.isEmpty()) return 0;
-	KviIrcUserEntry *u = tqfind(nick);
+	KviIrcUserEntry *u = find(nick);
 	if(!u) return g_pRegisteredUserDataBase->findMatchingUser(nick,user,host);
 	KviRegisteredUser* pUser=0;
 
@@ -189,7 +189,7 @@ KviRegisteredUser* KviIrcUserDataBase::registeredUser(const TQString & nick,cons
 KviRegisteredUser* KviIrcUserDataBase::registeredUser(const TQString & nick)
 {
 	if(nick.isEmpty()) return 0;
-	KviIrcUserEntry *u = tqfind(nick);
+	KviIrcUserEntry *u = find(nick);
 	if(!u) return 0;
 	return registeredUser(nick,u->user(),u->host());
 }
@@ -203,7 +203,7 @@ void KviIrcUserDataBase::clear()
 
 KviIrcUserEntry * KviIrcUserDataBase::insertUser(const TQString &nick,const TQString &user,const TQString &hostname)
 {
-	KviIrcUserEntry * e = m_pDict->tqfind(nick);
+	KviIrcUserEntry * e = m_pDict->find(nick);
 	if(e)
 	{
 		e->m_nRefs++;
diff --git a/src/kvilib/irc/kvi_ircuserdb.h b/src/kvilib/irc/kvi_ircuserdb.h
index ec967331..d60f5087 100644
--- a/src/kvilib/irc/kvi_ircuserdb.h
+++ b/src/kvilib/irc/kvi_ircuserdb.h
@@ -125,7 +125,7 @@ private:
 public:
 	void clear();
 	KviIrcUserEntry * insertUser(const TQString &nick,const TQString &user,const TQString &hostname);
-	KviIrcUserEntry * tqfind(const TQString &nick){ return m_pDict->tqfind(nick); };
+	KviIrcUserEntry * find(const TQString &nick){ return m_pDict->find(nick); };
 	void removeUser(const TQString &nick,KviIrcUserEntry * e);
 	KviPointerHashTable<TQString,KviIrcUserEntry> * dict(){ return m_pDict; };
 
diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp
index 67887e9c..4e3468df 100644
--- a/src/kvilib/irc/kvi_useridentity.cpp
+++ b/src/kvilib/irc/kvi_useridentity.cpp
@@ -148,7 +148,7 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
 	KviUserIdentity * ret;
 	if(!m_szDefaultIdentity.isEmpty())
 	{
-		ret = m_pIdentityDict->tqfind(m_szDefaultIdentity);
+		ret = m_pIdentityDict->find(m_szDefaultIdentity);
 		if(ret)return ret;
 	}
 
@@ -174,7 +174,7 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
 	ret->setPartMessage(KVI_DEFAULT_PART_MESSAGE);
 	ret->setQuitMessage(KVI_DEFAULT_TQUIT_MESSAGE);
 	
-	m_pIdentityDict->tqreplace(ret->id(),ret);
+	m_pIdentityDict->replace(ret->id(),ret);
 	
 	return ret;
 }
@@ -198,7 +198,7 @@ void KviUserIdentityManager::load(const TQString &szFileName)
 
 			KviUserIdentity * id = new KviUserIdentity();
 			if(id->load(cfg))
-				m_pIdentityDict->tqreplace(id->id(),id);
+				m_pIdentityDict->replace(id->id(),id);
 			else
 				delete id;
 		}
@@ -232,7 +232,7 @@ void KviUserIdentityManager::copyFrom(KviUserIdentityManager * pWorkingCopy)
 	{
 		KviUserIdentity * pNew = new KviUserIdentity();
 		pNew->copyFrom(*id);
-		m_pIdentityDict->tqreplace(pNew->id(),pNew);
+		m_pIdentityDict->replace(pNew->id(),pNew);
 		++it;
 	}
 }
diff --git a/src/kvilib/irc/kvi_useridentity.h b/src/kvilib/irc/kvi_useridentity.h
index bcc5e1b4..e35c4050 100644
--- a/src/kvilib/irc/kvi_useridentity.h
+++ b/src/kvilib/irc/kvi_useridentity.h
@@ -128,7 +128,7 @@ public:
 	static KviUserIdentityManager * instance(){ return m_pInstance; };
 
 	KviPointerHashTable<TQString,KviUserIdentity> * identityDict(){ return m_pIdentityDict; };
-	const KviUserIdentity * findIdentity(const TQString &szId){ return m_pIdentityDict->tqfind(szId); };
+	const KviUserIdentity * findIdentity(const TQString &szId){ return m_pIdentityDict->find(szId); };
 	// NEVER NULL
 	const KviUserIdentity * defaultIdentity();
 
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index 07a69658..9986530a 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -348,13 +348,13 @@ bool KviHttpRequest::event(TQEvent *e)
 
 void KviHttpRequest::emitLines(KviDataBuffer * pDataBuffer)
 {
-	int idx = pDataBuffer->tqfind((const unsigned char *)"\n",1);
+	int idx = pDataBuffer->find((const unsigned char *)"\n",1);
 	while(idx != -1)
 	{
 		KviStr tmp((const char *)(m_pBuffer->data()),idx);
 		tmp.stripRight('\r');
 		pDataBuffer->remove(idx + 1);
-		idx = pDataBuffer->tqfind((const unsigned char *)"\n",1);
+		idx = pDataBuffer->find((const unsigned char *)"\n",1);
 		emit data(tmp);
 	}
 }
@@ -531,12 +531,12 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 			KviStr szName = s->left(idx);
 			s->cutLeft(idx + 1);
 			s->stripWhiteSpace();
-			hdr.tqreplace(szName.ptr(),new KviStr(*s));
+			hdr.replace(szName.ptr(),new KviStr(*s));
 			//debug("FOUND HEADER (%s)=(%s)",szName.ptr(),s->ptr());
 		}
 	}
 
-	KviStr * size = hdr.tqfind("Content-length");
+	KviStr * size = hdr.find("Content-length");
 	if(size)
 	{
 		bool bOk;
@@ -544,13 +544,13 @@ bool KviHttpRequest::processHeader(KviStr &szHeader)
 		if(!bOk)m_uTotalSize = 0;
 	}
 
-	KviStr * contentEncoding = hdr.tqfind("Content-encoding");
+	KviStr * contentEncoding = hdr.find("Content-encoding");
 	if(contentEncoding)
 	{
 		m_bGzip = contentEncoding->equalsCI("gzip");
 	}
 	
-	KviStr * transferEncoding = hdr.tqfind("Transfer-Encoding");
+	KviStr * transferEncoding = hdr.find("Transfer-Encoding");
 	if(transferEncoding)
 	{
 		if(kvi_strEqualCI(transferEncoding->ptr(),"chunked"))
@@ -651,7 +651,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
 		// time to process the header
 		m_pBuffer->append(*data);
 	
-		int idx = m_pBuffer->tqfind((const unsigned char *)"\r\n\r\n",4);
+		int idx = m_pBuffer->find((const unsigned char *)"\r\n\r\n",4);
 		if(idx == -1)
 		{
 			// header not complete
@@ -721,7 +721,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
 	// we're processing data in m_pBuffer here
 	if(m_bChunkedTransferEncoding)
 	{
-		// The transfer encoding is chunked: the buffer tqcontains
+		// The transfer encoding is chunked: the buffer contains
 		// chunks of data with an initial header composed
 		// of a hexadecimal length, an optional bullshit and a single CRLF
 		// The transfer terminates when we read a last chunk of size 0
@@ -776,7 +776,7 @@ void KviHttpRequest::processData(KviDataBuffer * data)
 				// We're looking for the beginning of a chunk now.
 				// Note that we might be at the end of a previous chunk that has a CRLF terminator
 				// we need to skip it.
-				int crlf = m_pBuffer->tqfind((const unsigned char *)"\r\n",2);
+				int crlf = m_pBuffer->find((const unsigned char *)"\r\n",2);
 				if(crlf != -1)
 				{
 					if(crlf == 0)
diff --git a/src/kvilib/net/kvi_ssl.cpp b/src/kvilib/net/kvi_ssl.cpp
index b6cb2c21..586f7fb4 100644
--- a/src/kvilib/net/kvi_ssl.cpp
+++ b/src/kvilib/net/kvi_ssl.cpp
@@ -564,7 +564,7 @@ void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviStr>
 					arr[i]->cutLeft(idx + 1);
 					if(szTok.hasData() && arr[i]->hasData())
 					{
-						dict->tqreplace(szTok.ptr(),new KviStr(arr[i]->ptr()));
+						dict->replace(szTok.ptr(),new KviStr(arr[i]->ptr()));
 					}
 				}
 			}
@@ -577,7 +577,7 @@ void KviSSLCertificate::splitX509String(KviPointerHashTable<const char *,KviStr>
 
 const char * KviSSLCertificate::dictEntry(KviPointerHashTable<const char *,KviStr> * dict,const char * entry)
 {
-	KviStr * t = dict->tqfind(entry);
+	KviStr * t = dict->find(entry);
 	if(!t)return __tr("Unknown");
 	return t->ptr();
 }
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index 296db7be..7bf7e348 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -609,7 +609,7 @@ bool KviMessageCatalogue::load(const TQString& name)
 			KVI_SWAP_IF_NEEDED(bMustSwap,transDescriptor[i].length));
 
 		// In some (or all?) *.mo files the first string
-		// is zero bytes long and the translated one tqcontains
+		// is zero bytes long and the translated one contains
 		// informations about the translation
 		if(e->m_szKey.len() == 0)
 		{
@@ -629,7 +629,7 @@ bool KviMessageCatalogue::load(const TQString& name)
 	// find out the text encoding , if possible
 	if(szHeader.hasData())
 	{
-		// tqfind "charset=*\n"
+		// find "charset=*\n"
 		int idx = szHeader.findFirstIdx("charset=");
 		if(idx != -1)
 		{
@@ -658,14 +658,14 @@ bool KviMessageCatalogue::load(const TQString& name)
 
 const char * KviMessageCatalogue::translate(const char *text)
 {
-	KviTranslationEntry * aux = m_pMessages->tqfind(text);
+	KviTranslationEntry * aux = m_pMessages->find(text);
 	if(aux)return aux->m_szEncodedTranslation.ptr();
 	return text;
 }
 
 const TQString & KviMessageCatalogue::translateToTQString(const char *text)
 {
-	KviTranslationEntry * aux = m_pMessages->tqfind(text);
+	KviTranslationEntry * aux = m_pMessages->find(text);
 	if(aux)
 	{
 		if(aux->m_pTQTranslation)return *(aux->m_pTQTranslation);
@@ -838,7 +838,7 @@ namespace KviLocale
 		if(idx != -1)
 		{
 			// composite codec: either UTF-8 [child codec] or child codec [UTF-8]
-			KviSmartTextCodec * c = g_pSmartCodecDict->tqfind(szName);
+			KviSmartTextCodec * c = g_pSmartCodecDict->find(szName);
 			if(c)return c;
 			
 			
@@ -855,7 +855,7 @@ namespace KviLocale
 			}
 			if(c->ok())
 			{
-				g_pSmartCodecDict->tqreplace(szName,c);
+				g_pSmartCodecDict->replace(szName,c);
 				return c;
 			} else {
 				delete c;
@@ -872,7 +872,7 @@ namespace KviLocale
 	bool loadCatalogue(const TQString &name,const TQString &szLocaleDir)
 	{
 		//debug("Looking up catalogue %s",name);
-		if(g_pCatalogueDict->tqfind(KviTQString::toUtf8(name).data()))return true; // already loaded
+		if(g_pCatalogueDict->find(KviTQString::toUtf8(name).data()))return true; // already loaded
 
 		TQString szBuffer;
 
@@ -1041,7 +1041,7 @@ namespace KviLocale
 
 	KviMessageCatalogue * getLoadedCatalogue(const TQString& name)
 	{
-		return g_pCatalogueDict->tqfind(KviTQString::toUtf8(name).data());
+		return g_pCatalogueDict->find(KviTQString::toUtf8(name).data());
 	}
 
 
@@ -1049,7 +1049,7 @@ namespace KviLocale
 	{
 		if(context)
 		{
-			KviMessageCatalogue * c = g_pCatalogueDict->tqfind(context);
+			KviMessageCatalogue * c = g_pCatalogueDict->find(context);
 			if(!c)
 			{
 				// FIXME: Should really try to load the catalogue here!
@@ -1065,7 +1065,7 @@ namespace KviLocale
 	{
 		if(context)
 		{
-			KviMessageCatalogue * c = g_pCatalogueDict->tqfind(context);
+			KviMessageCatalogue * c = g_pCatalogueDict->find(context);
 			if(!c)
 			{
 				// FIXME: Should really try to load the catalogue here!
@@ -1099,7 +1099,7 @@ TQString KviTranslator::translate(const char *context,const char * message,const
 }
 #endif
 
-TQString KviTranslator::tqfind(const char *context,const char * message) const
+TQString KviTranslator::find(const char *context,const char * message) const
 {
 	// we ignore contexts for qt translations
 	return g_pMainCatalogue->translateToTQString(message);
diff --git a/src/kvilib/system/kvi_locale.h b/src/kvilib/system/kvi_locale.h
index 27b666b7..6736a118 100644
--- a/src/kvilib/system/kvi_locale.h
+++ b/src/kvilib/system/kvi_locale.h
@@ -136,7 +136,7 @@ class KVILIB_API KviTranslator : public TQTranslator
 		virtual TQString translate(const char * context,const char * message,const char * comment) const;
 #endif
 		// Deprecated in qt 4.x
-		virtual TQString tqfind(const char * context,const char * message) const;
+		virtual TQString find(const char * context,const char * message) const;
 #ifndef COMPILE_USE_QT4
 		// Dead in qt 4.x
 		virtual TQTranslatorMessage findMessage(const char * context,const char * sourceText,const char * comment = 0) const;
diff --git a/src/kvilib/tal/kvi_tal_listview.cpp b/src/kvilib/tal/kvi_tal_listview.cpp
index 27d9a54d..f7c31719 100644
--- a/src/kvilib/tal/kvi_tal_listview.cpp
+++ b/src/kvilib/tal/kvi_tal_listview.cpp
@@ -458,7 +458,7 @@
 
 	KviTalCheckListItem::ToggleState KviTalCheckListItem::storedState(KviTalCheckListItem *key) const
 	{
-	    TQHash<KviTalCheckListItem *, KviTalCheckListItem::ToggleState>::Iterator it = d->statesDict.tqfind(key);
+	    TQHash<KviTalCheckListItem *, KviTalCheckListItem::ToggleState>::Iterator it = d->statesDict.find(key);
 	    if (it != d->statesDict.end())
 	        return it.value();
 	    else
@@ -499,7 +499,7 @@
 	        TQRect r(x, y, boxsize-3, boxsize-3);
 	        // columns might have been swapped
 	        r.moveBy(lv->header()->sectionPos(0), 0);
-	        if (!r.tqcontains(pos))
+	        if (!r.contains(pos))
 	            return;
 	    }
 	    if ((myType == CheckBox) || (myType == CheckBoxController))  {
@@ -1187,7 +1187,7 @@
 	void KviTalCheckListItem::setStoredState( ToggleState newState, void *key )
 	{
 	    if ( myType == CheckBox || myType == CheckBoxController )
-		d->statesDict->tqreplace( key, new ToggleState(newState) );
+		d->statesDict->replace( key, new ToggleState(newState) );
 	}
 	
 	KviTalCheckListItem::ToggleState KviTalCheckListItem::storedState( void *key ) const
@@ -1195,7 +1195,7 @@
 	    if ( !d->statesDict )
 		return Off;
 	
-	    ToggleState *foundState = d->statesDict->tqfind( key );
+	    ToggleState *foundState = d->statesDict->find( key );
 	    if ( foundState )
 		return ToggleState( *foundState );
 	    else
@@ -1236,7 +1236,7 @@
 		TQRect r( x, y, boxsize-3, boxsize-3 );
 		// columns might have been swapped
 		r.moveBy( lv->header()->sectionPos( 0 ), 0 );
-		if ( !r.tqcontains( pos ) )
+		if ( !r.contains( pos ) )
 		    return;
 	    }
 	    if ( ( myType == CheckBox ) || ( myType == CheckBoxController) )  {
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp
index 296de6a6..4d92f5ee 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/kvi_actionmanager.cpp
@@ -60,7 +60,7 @@ KviActionManager::KviActionManager()
 
 #define CATEGORY(__var,__name,__vname,__descr) \
 	__var = new KviActionCategory(__name,__vname,__descr); \
-	m_pCategories->tqreplace(__name,__var)
+	m_pCategories->replace(__name,__var)
 
 	CATEGORY(m_pCategoryIrc,"irc",__tr2qs("IRC"),__tr2qs("IRC Context related actions"));
 	CATEGORY(m_pCategoryGeneric,"generic",__tr2qs("Generic"),__tr2qs("Generic actions"));
@@ -146,7 +146,7 @@ void KviActionManager::killAllKvsUserActions()
 
 bool KviActionManager::coreActionExists(const TQString &szName)
 {
-	KviAction *a = m_pActions->tqfind(szName);
+	KviAction *a = m_pActions->find(szName);
 	if(a)return (!a->isKviUserActionNeverOverrideThis());
 	return false;
 }
@@ -159,7 +159,7 @@ TQString KviActionManager::nameForAutomaticAction(const TQString &szTemplate)
 	do {
 		KviTQString::sprintf(ret,"%Q%d",&szTemplate,i);
 		i++;
-	} while(m_pActions->tqfind(ret));
+	} while(m_pActions->find(ret));
 
 	return ret;
 }
@@ -173,7 +173,7 @@ KviActionCategory * KviActionManager::category(const TQString &szName)
 {
 	if(!szName.isEmpty())
 	{
-		KviActionCategory * c = m_pCategories->tqfind(szName);
+		KviActionCategory * c = m_pCategories->find(szName);
 		if(c)return c;
 	}
 	return m_pCategoryGeneric;
@@ -248,7 +248,7 @@ void KviActionManager::delayedRegisterAccelerators()
 
 bool KviActionManager::registerAction(KviAction * a)
 {
-	if(m_pActions->tqfind(a->name()))return false;
+	if(m_pActions->find(a->name()))return false;
 	connect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed()));
 	m_pActions->insert(a->name(),a);
 	if(g_pFrame)a->registerAccelerator(); // otherwise it is delayed!
@@ -263,7 +263,7 @@ void KviActionManager::actionDestroyed()
 
 bool KviActionManager::unregisterAction(const TQString &szName)
 {
-	KviAction * a = m_pActions->tqfind(szName);
+	KviAction * a = m_pActions->find(szName);
 	if(!a)return false;
 	disconnect(a,TQT_SIGNAL(destroyed()),this,TQT_SLOT(actionDestroyed()));
 	a->unregisterAccelerator();
@@ -272,15 +272,15 @@ bool KviActionManager::unregisterAction(const TQString &szName)
 
 KviAction * KviActionManager::getAction(const TQString &szName)
 {
-	KviAction * a = m_pActions->tqfind(szName);
+	KviAction * a = m_pActions->find(szName);
 	if(a)return a;
-	int idx = szName.tqfind('.');
+	int idx = szName.find('.');
 	if(idx < 0)
 	{
 		// backward compatibility: try to lookup the name with the kvirc. prefix
 		TQString s = "kvirc.";
 		s += szName;
-		return m_pActions->tqfind(s);
+		return m_pActions->find(s);
 	}
 	if((idx == 5) && (!m_bCoreActionsRegistered))
 	{
@@ -293,14 +293,14 @@ KviAction * KviActionManager::getAction(const TQString &szName)
 		{
 			register_core_actions(this);
 			m_bCoreActionsRegistered = true;
-			a = m_pActions->tqfind(szName);
+			a = m_pActions->find(szName);
 			return a;
 		}
 	}
 	// try to preload the module that might register this action...
 	TQString szModule = szName.left(idx);
 	if(!g_pModuleManager->getModule(szModule))return 0;
-	return m_pActions->tqfind(szName);
+	return m_pActions->find(szName);
 }
 
 void KviActionManager::listActionsByCategory(const TQString &szCatName,KviPointerList<KviAction> * pBuffer)
diff --git a/src/kvirc/kernel/kvi_actionmanager.h b/src/kvirc/kernel/kvi_actionmanager.h
index d707e881..693c0c1e 100644
--- a/src/kvirc/kernel/kvi_actionmanager.h
+++ b/src/kvirc/kernel/kvi_actionmanager.h
@@ -96,7 +96,7 @@ public:
 	void emitRemoveActionsHintRequest();
 protected:
 	void setCurrentToolBar(KviCustomToolBar * t);
-	KviAction * findAction(const TQString &szName){ return m_pActions->tqfind(szName); };
+	KviAction * findAction(const TQString &szName){ return m_pActions->find(szName); };
 	void customizeToolBarsDialogCreated();
 	void customizeToolBarsDialogDestroyed();
 	void tryFindCurrentToolBar();
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 3e68ec55..30f26dc5 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -482,8 +482,8 @@ void KviApp::setup()
 	{
 		TQString szStyleData;
 		KviFileUtils::readFile(szStylesheetFile,szStyleData);
-		szStyleData.tqreplace("global://",m_szGlobalKvircDir);
-		szStyleData.tqreplace("local://",m_szLocalKvircDir);
+		szStyleData.replace("global://",m_szGlobalKvircDir);
+		szStyleData.replace("local://",m_szLocalKvircDir);
 		setStyleSheet(szStyleData);
 	}
 #endif
@@ -703,7 +703,7 @@ void KviApp::contextSensitiveHelp()
 		TQMetaObject * o = w->tqmetaObject();
 		if(o)
 		{
-			int i = o->tqfindProperty("contextSensitiveHelp",true);
+			int i = o->findProperty("contextSensitiveHelp",true);
 			if(i != -1)
 			{
 				TQVariant v = w->property("contextSensitiveHelp");
@@ -733,7 +733,7 @@ void KviApp::loadDefaultScript()
 	cmd.prepend("parse \"");
 	cmd.append("\"");
 #ifdef COMPILE_ON_WINDOWS
-	cmd.tqreplace("\\","\\\\");
+	cmd.replace("\\","\\\\");
 #endif
 	KviKvsScript::run(cmd,g_pFrame->firstConsole());
 	// now line up the toolbars (they may get messed while loading the script)
@@ -1785,7 +1785,7 @@ KviConsole * KviApp::topmostConnectedConsole()
 
 KviWindow * KviApp::findWindow(const char * windowId)
 {
-	return g_pGlobalWindowDict->tqfind(windowId);
+	return g_pGlobalWindowDict->find(windowId);
 }
 
 KviWindow * KviApp::findWindowByCaption(const TQString &windowCaption,int iContextId)
@@ -1869,10 +1869,10 @@ void KviApp::addRecentChannel(const TQString& szChan,const TQString& net)
 {
 	if(!m_pRecentChannelsDict)
 		buildRecentChannels();
-	TQStringList* pList=m_pRecentChannelsDict->tqfind(net.utf8().data());
+	TQStringList* pList=m_pRecentChannelsDict->find(net.utf8().data());
 	if(pList)
 	{
-		if(!pList->tqcontains(szChan)) pList->append(szChan);
+		if(!pList->contains(szChan)) pList->append(szChan);
 	}
 	else
 	{
@@ -1900,10 +1900,10 @@ void KviApp::buildRecentChannels()
 			szNet = (*it).section( KVI_RECENT_CHANNELS_SEPARATOR, 1 );
 			if(!szNet.isEmpty())
 			{
-				TQStringList* pList=m_pRecentChannelsDict->tqfind(szNet.utf8().data());
+				TQStringList* pList=m_pRecentChannelsDict->find(szNet.utf8().data());
 				if(pList)
 				{
-					if(!pList->tqcontains(szChan)) pList->append(szChan);
+					if(!pList->contains(szChan)) pList->append(szChan);
 				}
 				else
 				{
@@ -1935,7 +1935,7 @@ void KviApp::saveRecentChannels()
 TQStringList* KviApp::getRecentChannels(const TQString& net)
 {
 	if(!m_pRecentChannelsDict) buildRecentChannels();
-	return m_pRecentChannelsDict->tqfind(net.utf8().data());
+	return m_pRecentChannelsDict->find(net.utf8().data());
 }
 
 
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 61272d1b..6a9ad8ab 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -484,7 +484,7 @@ bool KviApp::mapImageFile(TQString &szRetPath,const char * filename)
 
 	KviStr szBestMatch;
 
-	while(szRetPath.tqfind(KVI_PATH_SEPARATOR) != -1)
+	while(szRetPath.find(KVI_PATH_SEPARATOR) != -1)
 	{
 		KviTQString::cutToFirst(szRetPath,KVI_PATH_SEPARATOR);
 
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 4d2f255f..27555f0b 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -155,7 +155,7 @@ bool KviApp::checkFileAssociations()
 		return false;
 	} else {
 		TQString szIcon = applicationFilePath()+",1";
-		szIcon.tqreplace('/',"\\");
+		szIcon.replace('/',"\\");
 		if(!kvi_strEqualCI(szIcon.local8Bit().data(),buffer)){
 			free(buffer);
 			return false;
@@ -187,7 +187,7 @@ bool KviApp::checkFileAssociations()
 		return false;
 	} else {
 		TQString szCmd = applicationFilePath()+" \"%1\"";
-		szCmd.tqreplace('/',"\\");
+		szCmd.replace('/',"\\");
 		if(!kvi_strEqualCI(szCmd.local8Bit().data(),buffer)) {
 			free(buffer);
 			return false;
@@ -305,7 +305,7 @@ bool KviApp::checkUriAssociations(char * proto)
 		return false;
 	} else {
 		TQString szIcon = applicationFilePath()+",0";
-		szIcon.tqreplace('/',"\\");
+		szIcon.replace('/',"\\");
 		if(!kvi_strEqualCI(szIcon.local8Bit().data(),buffer)){
 			free(buffer);
 			return false;
@@ -339,7 +339,7 @@ bool KviApp::checkUriAssociations(char * proto)
 		return false;
 	} else {
 		TQString szCmd = applicationFilePath()+" \"%1\"";
-		szCmd.tqreplace('/',"\\");
+		szCmd.replace('/',"\\");
 		if(!kvi_strEqualCI(szCmd.local8Bit().data(),buffer)) {
 			free(buffer);
 			return false;
@@ -365,7 +365,7 @@ void KviApp::setupUriAssociations(char * proto)
 
 	KviTQCString tmp;
 	TQString appPath = applicationFilePath();
-	appPath.tqreplace('/',"\\");
+	appPath.replace('/',"\\");
 
 	SHDeleteKey(HKEY_CLASSES_ROOT,key);
 	
@@ -399,7 +399,7 @@ void KviApp::setupFileAssociations()
 
 	KviTQCString tmp;
 	TQString appPath = applicationFilePath();
-	appPath.tqreplace('/',"\\");
+	appPath.replace('/',"\\");
 
 	SHDeleteKey(HKEY_CLASSES_ROOT,".kvs");
 
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 7f32861b..b548afdb 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -951,9 +951,9 @@ void KviChangeUserModeAction::popupAboutToShow()
 	id = m_pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_INVISIBLE)),__tr2qs("Invisible (+i)"));
 	m_pPopup->setItemChecked(id,c->connection()->userInfo()->hasUserMode('i'));
 	
-	szModes.tqreplace("w","");
-	szModes.tqreplace("s","");
-	szModes.tqreplace("i","");
+	szModes.replace("w","");
+	szModes.replace("s","");
+	szModes.replace("i","");
 	while(!szModes.isEmpty())
 	{
 		TQChar ccc = szModes[0];
@@ -972,7 +972,7 @@ void KviChangeUserModeAction::popupActivated(int id)
 	if(!c->isConnected())return;
 	if(!text.isEmpty())
 	{
-		int idx = text.tqfind('+');
+		int idx = text.find('+');
 		if(idx != -1)
 		{
 			idx++;
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
index eac0cdf1..33b7ed68 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
@@ -86,7 +86,7 @@ TQString KviCustomToolBarManager::idForNewToolBar(const TQString &szTemplate)
 			tmp.setNum(idx);
 			s += tmp;
 		}
-		if(!m_pDescriptors->tqfind(s))return s;
+		if(!m_pDescriptors->find(s))return s;
 		idx++;
 	}
 	return s;
@@ -105,20 +105,20 @@ KviCustomToolBarDescriptor * KviCustomToolBarManager::findDescriptorByInternalId
 
 bool KviCustomToolBarManager::renameDescriptor(const TQString &szId,const TQString &szNewId,const TQString &szNewLabelCode)
 {
-	KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId);
+	KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId);
 	if(!d)return false;
 	d->rename(szNewLabelCode);
 	if(szId == szNewId)return true; // already done
 	m_pDescriptors->setAutoDelete(false);
 	m_pDescriptors->remove(szId);
-	m_pDescriptors->tqreplace(szNewId,d);
+	m_pDescriptors->replace(szNewId,d);
 	m_pDescriptors->setAutoDelete(true);
 	return true;
 }
 
 bool KviCustomToolBarManager::destroyDescriptor(const TQString &szId)
 {
-	KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId);
+	KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId);
 	if(!d)return false;
 	m_pDescriptors->remove(szId); // will delete it too!
 	return true;
@@ -131,10 +131,10 @@ void KviCustomToolBarManager::clear()
 
 KviCustomToolBarDescriptor * KviCustomToolBarManager::create(const TQString &szId,const TQString &szLabelCode)
 {
-	KviCustomToolBarDescriptor * d = m_pDescriptors->tqfind(szId);
+	KviCustomToolBarDescriptor * d = m_pDescriptors->find(szId);
 	if(d)return d;
 	d = new KviCustomToolBarDescriptor(szId,szLabelCode);
-	m_pDescriptors->tqreplace(szId,d);
+	m_pDescriptors->replace(szId,d);
 	return d;
 }
 
@@ -193,7 +193,7 @@ void KviCustomToolBarManager::load(const TQString &szFileName)
 		KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(it.currentKey(),TQString());
 		d->m_bVisibleAtStartup = (cfg.readIntEntry("Visible",0) > 0);
 		if(!d->load(&cfg))delete d;
-		else m_pDescriptors->tqreplace(it.currentKey(),d);
+		else m_pDescriptors->replace(it.currentKey(),d);
 		++it;
 	}
 }
@@ -228,7 +228,7 @@ void KviCustomToolBarManager::loadScripttoolbarsCompat(const TQString &szFileNam
 		tmp.sprintf("%d",i);
 		KviCustomToolBarDescriptor * d = new KviCustomToolBarDescriptor(TQString(),TQString());
 		if(!d->loadScripttoolbarCompat(tmp.ptr(),&cfg))delete d;
-		else m_pDescriptors->tqreplace(d->id(),d);
+		else m_pDescriptors->replace(d->id(),d);
 	}
 
 	// get rid of the file now...
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.h b/src/kvirc/kernel/kvi_customtoolbarmanager.h
index cafe743b..18320bcb 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.h
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.h
@@ -57,7 +57,7 @@ public:
 	KviPointerHashTable<TQString,KviCustomToolBarDescriptor> * descriptors(){ return m_pDescriptors; };
 	KviCustomToolBar * firstExistingToolBar();
 	KviCustomToolBarDescriptor * create(const TQString &szId,const TQString &szLabelCode);
-	KviCustomToolBarDescriptor * tqfind(const TQString &szId){ return m_pDescriptors->tqfind(szId); };
+	KviCustomToolBarDescriptor * find(const TQString &szId){ return m_pDescriptors->find(szId); };
 	KviCustomToolBarDescriptor * findDescriptorByInternalId(int id);
 	void updateVisibleToolBars();
 	void createToolBarsVisibleAtStartup();
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index 5c72e7cb..3f39398a 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -90,8 +90,8 @@ void KviFileTransferManager::invokeTransferWindow(KviWindow * pWnd,bool bCreateM
 	{
 		KviPointerHashTable<TQString,TQVariant> d(7,false);
 		d.setAutoDelete(true);
-		d.tqreplace("bCreateMinimized",new TQVariant(bCreateMinimized,0));
-		d.tqreplace("bNoRaise",new TQVariant(bNoRaise,0));
+		d.replace("bCreateMinimized",new TQVariant(bCreateMinimized,0));
+		d.replace("bNoRaise",new TQVariant(bNoRaise,0));
 
 		KviModuleExtensionManager::instance()->allocateExtension(
 				"tool",
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index d990ff58..db362878 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -547,10 +547,10 @@ int KviIconManager::getSmallIconIdFromName(const TQString &szName)
 		{
 			int * pInt = new int;
 			*pInt = i;
-			m_pIconNames->tqreplace(TQString(g_szIconNames[i]),pInt);
+			m_pIconNames->replace(TQString(g_szIconNames[i]),pInt);
 		}
 	}
-	int * pInt = m_pIconNames->tqfind(szName);
+	int * pInt = m_pIconNames->find(szName);
 	if(!pInt)return 0;
 	return *pInt;
 }
@@ -610,7 +610,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCache(const TQString &szName)
 {
 	if(szName.isEmpty())return 0;
 
-	KviCachedPixmap * p = m_pCachedImages->tqfind(szName);
+	KviCachedPixmap * p = m_pCachedImages->find(szName);
 
 	if(p)
 	{
@@ -645,7 +645,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const TQString &
 {
 	if(szName.isEmpty())return 0;
 
-	KviCachedPixmap * p = m_pCachedImages->tqfind(szName);
+	KviCachedPixmap * p = m_pCachedImages->find(szName);
 
 	if(p)
 	{
@@ -772,16 +772,16 @@ void KviIconManager::urlToCachedFileName(KviStr &szFName)
 
 void KviIconManager::urlToCachedFileName(TQString &szFName)
 {
-	szFName.tqreplace(":","_");
-	szFName.tqreplace(";","_");
-	szFName.tqreplace("/","_");
-	szFName.tqreplace("\\","_");
-	szFName.tqreplace("\"","_");
-	szFName.tqreplace("\'","_");
-	szFName.tqreplace("(","_");
-	szFName.tqreplace(")","_");
-	szFName.tqreplace("?","_");
-	szFName.tqreplace("___",".");
+	szFName.replace(":","_");
+	szFName.replace(";","_");
+	szFName.replace("/","_");
+	szFName.replace("\\","_");
+	szFName.replace("\"","_");
+	szFName.replace("\'","_");
+	szFName.replace("(","_");
+	szFName.replace(")","_");
+	szFName.replace("?","_");
+	szFName.replace("___",".");
 }
 
 KviAvatar * KviIconManager::getAvatar(const TQString &szLocalPath,const TQString &szName)
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index d4d79a96..4c91a48b 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -723,7 +723,7 @@ void KviIrcConnection::userInfoReceived(const TQString &szUserName,const TQStrin
 	userInfo()->setUserName(szUserName);
 	TQString szUnmaskedHost = m_pUserInfo->unmaskedHostName();
 	// Update the user entry
-	KviIrcUserEntry * e = userDataBase()->tqfind(userInfo()->nickName());
+	KviIrcUserEntry * e = userDataBase()->find(userInfo()->nickName());
 	if(e) // should be there! (we have the permanent entry in the notify list view)
 	{
 		e->setUser(szUserName);
@@ -1003,7 +1003,7 @@ void KviIrcConnection::loginToIrcServer()
 	m_pConsole->notifyListView()->join(m_pUserInfo->nickName(),"*","*");
 
 	// set own avatar if we have it
-	KviIrcUserEntry * e = userDataBase()->tqfind(userInfo()->nickName());
+	KviIrcUserEntry * e = userDataBase()->find(userInfo()->nickName());
 	if(e) // should be there!
 	{
 		if(!e->avatar())
@@ -1189,7 +1189,7 @@ void KviIrcConnection::loginComplete(const TQString &szNickName)
 				KviIrcUserDataBase * db = userDataBase();
 				if(db)
 				{
-					KviIrcUserEntry * e = db->tqfind(szNick);
+					KviIrcUserEntry * e = db->find(szNick);
 					if(e)
 					{
 						user = e->user();
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
index 0553354d..9c5ef5ae 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
@@ -57,19 +57,19 @@ void KviIrcConnectionServerInfo::setSupportedChannelModes(const TQString &szSupp
 {
 	int pos=-1;
 	
-	pos=szSupportedChannelModes.tqfind(',');
+	pos=szSupportedChannelModes.find(',');
 	if(pos>=0) m_szListModes=szSupportedChannelModes.left(pos);
 	
-	pos=szSupportedChannelModes.tqfindRev(',');
+	pos=szSupportedChannelModes.findRev(',');
 	if(pos>=0) m_szPlainModes=szSupportedChannelModes.right(szSupportedChannelModes.length()+pos-1);
 	
 	m_szSupportedChannelModes = szSupportedChannelModes;
-	m_bSupportsModesIe = (szSupportedChannelModes.tqcontains('e') && szSupportedChannelModes.tqcontains('I'));
+	m_bSupportsModesIe = (szSupportedChannelModes.contains('e') && szSupportedChannelModes.contains('I'));
 	
 	TQChar* aux=(TQChar*)szSupportedChannelModes.ucs2();
 	while(aux->tqunicode())
 	{
-		if(!m_szSupportedChannelModes.tqcontains(*aux))
+		if(!m_szSupportedChannelModes.contains(*aux))
 			m_szSupportedChannelModes.append(*aux);
 		aux++;
 	}
@@ -189,11 +189,11 @@ kvi_u32_t KviIrcConnectionServerInfo::modeFlagFromModeChar(TQChar c)
 void KviIrcConnectionServerInfo::setServerVersion(const TQString & version)
 {
 	if(m_pServInfo) delete m_pServInfo;
-	if(version.tqcontains("unreal",false))
+	if(version.contains("unreal",false))
 		m_pServInfo = new KviUnrealIrcServerInfo(version);
-	else if(version.tqcontains("bahamut",false))
+	else if(version.contains("bahamut",false))
 		m_pServInfo = new KviBahamutIrcServerInfo(version);
-	else if(version.tqcontains("hyperion",false))
+	else if(version.contains("hyperion",false))
 		m_pServInfo = new KviHyperionIrcServerInfo(version);
 	else
 		m_pServInfo = new KviBasicIrcServerInfo(version);
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 49e88644..f092b62e 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -460,8 +460,8 @@ void KviIrcConnectionTargetResolver::haveServerIp()
 		if(!validateLocalAddress(m_pTarget->bindAddress(),bindAddress))
 		{
 			TQString szBindAddress = m_pTarget->bindAddress();
-			if((szBindAddress.tqfind('.') != -1) ||
-				(szBindAddress.tqfind(':') != -1))
+			if((szBindAddress.find('.') != -1) ||
+				(szBindAddress.find(':') != -1))
 			{
 				if(!_OUTPUT_MUTE)
 					m_pConsole->output(KVI_OUT_SYSTEMWARNING,
@@ -486,7 +486,7 @@ void KviIrcConnectionTargetResolver::haveServerIp()
 					if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress),bindAddress))
 					{
 						// if it is not an interface name , kill it for now and let the user correct the address
-						if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).tqfind(':') != -1)
+						if(KVI_OPTION_STRING(KviOption_stringIpV6ConnectionBindAddress).find(':') != -1)
 						{
 							if(!_OUTPUT_MUTE)
 								m_pConsole->output(KVI_OUT_SYSTEMWARNING,
@@ -515,7 +515,7 @@ void KviIrcConnectionTargetResolver::haveServerIp()
 					if(!validateLocalAddress(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress),bindAddress))
 					{
 						// if it is not an interface name , kill it for now and let the user correct the address
-						if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).tqfind(':') != -1)
+						if(KVI_OPTION_STRING(KviOption_stringIpV4ConnectionBindAddress).find(':') != -1)
 						{
 							if(!_OUTPUT_MUTE)
 								m_pConsole->output(KVI_OUT_SYSTEMWARNING,
diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
index 22674f00..0c7164d9 100644
--- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
@@ -33,7 +33,7 @@ KviIrcConnectionUserInfo::KviIrcConnectionUserInfo()
 
 bool KviIrcConnectionUserInfo::hasUserMode(const TQChar &m)
 {
-	return m_szUserMode.tqcontains(m) > 0;
+	return m_szUserMode.contains(m) > 0;
 }
 
 bool KviIrcConnectionUserInfo::addUserMode(const TQChar &m)
@@ -45,9 +45,9 @@ bool KviIrcConnectionUserInfo::addUserMode(const TQChar &m)
 
 bool KviIrcConnectionUserInfo::removeUserMode(const TQChar &m)
 {
-	int idx = m_szUserMode.tqfind(m,0);
+	int idx = m_szUserMode.find(m,0);
 	if(idx == -1)return false;
-	m_szUserMode.tqreplace(m,TQString(""));
+	m_szUserMode.replace(m,TQString(""));
 	return true;
 }
 
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index ce71efa1..18feca1e 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -845,8 +845,8 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const TQString &szQui
 				KVS_TRIGGER_EVENT_0(KviEvent_OnDisconnectRequest,m_pConsole);
 				TQString szQuit = szQuitMsg;
 				if(szQuit.isEmpty())szQuit = KVI_OPTION_STRING(KviOption_stringQuitMessage);
-				szQuit.tqreplace(";","\\;");
-				szQuit.tqreplace("\n"," ");
+				szQuit.replace(";","\\;");
+				szQuit.replace("\n"," ");
 				TQString buffer;
 				KviKvsVariant ret;
 				if(KviKvsScript::evaluate(szQuit,console(),0,&ret))
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 2a35d787..0dafad9c 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -151,7 +151,7 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result)
 	result.iPort = 6667;
 	result.iError=0;
 
-	int iProtoLen = url.tqfind("://");
+	int iProtoLen = url.find("://");
 	if(iProtoLen!=-1) { 
 		if(KviTQString::equalCIN(url,"irc",3)) {
 			// OK, seems to be a valid proto;
@@ -168,7 +168,7 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result)
 				//irc(???):// proto??
 				result.iError |= InvalidProtocol;
 			}
-			iProtoLen = url.tqfind("://");
+			iProtoLen = url.find("://");
 			url = url.right(url.length()-iProtoLen-3);
 		} else {
 			result.iError |= InvalidProtocol;
@@ -176,13 +176,13 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result)
 	}
 	//Ok, we understand a protocol.. Now we shuld find a server name:)
 	int iTmp;
-	iTmp = url.tqfind(':');
+	iTmp = url.find(':');
 	if(iTmp!=-1) {
 		result.szHost = url.left(iTmp);
 		url = url.right(url.length()-iTmp-1);
 		// Accepted, now the time for the port:)
 		bool bOk;
-		if( (iTmp = url.tqfind('/')) != -1) { // any channels pending?
+		if( (iTmp = url.find('/')) != -1) { // any channels pending?
 			result.iPort = url.left(iTmp).toUInt(&bOk);
 			if(!bOk) {
 				result.iPort = 6667;
@@ -197,7 +197,7 @@ void KviIrcUrl::split(TQString url, KviIrcUrlParts& result)
 			}
 			url = "";
 		}
-	} else if( (iTmp = url.tqfind('/')) != -1) { // have channels??
+	} else if( (iTmp = url.find('/')) != -1) { // have channels??
 		result.szHost = url.left(iTmp);
 		url = url.right(url.length()-iTmp-1);
 	} else {
diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp
index 959978b4..7a55ee99 100644
--- a/src/kvirc/kernel/kvi_main.cpp
+++ b/src/kvirc/kernel/kvi_main.cpp
@@ -255,16 +255,16 @@ int parseArgs(ParseArgs * a)
 					{
 						if(a->szExecCommand.hasData())a->szExecCommand.append('\n');
 						a->szExecCommand.append("parse \"");
-						tmp.tqreplace('$',"\\$");
-						tmp.tqreplace('\\',"\\\\");
+						tmp.replace('$',"\\$");
+						tmp.replace('\\',"\\\\");
 						a->szExecCommand.append(tmp);
 						a->szExecCommand.append('"');
 					} else if(KviTQString::equalCI(ri,".kvt"))
 					{
 						if(a->szExecCommand.hasData())a->szExecCommand.append('\n');
 						a->szExecCommand.append("theme.install \"");
-						tmp.tqreplace('$',"\\$");
-						tmp.tqreplace('\\',"\\\\");
+						tmp.replace('$',"\\$");
+						tmp.replace('\\',"\\\\");
 						a->szExecCommand.append(tmp);
 						a->szExecCommand.append('"');
 					} else
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index 83b5e0e4..029a962e 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -172,7 +172,7 @@ void KviNotifyListManager::notifyOnLine(const TQString &nick,const TQString &use
 	
 	while(KviRegisteredUser * u = it.current())
 	{
-		if(TQStringList::split(",",u->getProperty("notify")).tqfindIndex(nick)!=-1)
+		if(TQStringList::split(",",u->getProperty("notify")).findIndex(nick)!=-1)
 		{
 			TQString szComment=u->getProperty("comment");
 			if(!szComment.isEmpty())
@@ -232,7 +232,7 @@ void KviNotifyListManager::notifyOffLine(const TQString &nick,const TQString &us
 		
 		while(KviRegisteredUser * u = it.current())
 		{
-			if(TQStringList::split(",",u->getProperty("notify")).tqfindIndex(nick)!=-1)
+			if(TQStringList::split(",",u->getProperty("notify")).findIndex(nick)!=-1)
 			{
 				TQString szComment=u->getProperty("comment");
 				if(!szComment.isEmpty())
@@ -386,14 +386,14 @@ void KviIsOnNotifyListManager::buildRegUserDict()
 			notify.stripWhiteSpace();
 			while(!notify.isEmpty())
 			{
-				int idx = notify.tqfind(' ');
+				int idx = notify.find(' ');
 				if(idx > 0)
 				{
 					TQString single = notify.left(idx);
-					m_pRegUserDict->tqreplace(single,new TQString(u->name()));
+					m_pRegUserDict->replace(single,new TQString(u->name()));
 					notify.remove(0,idx+1);
 				} else {
-					m_pRegUserDict->tqreplace(notify,new TQString(u->name()));
+					m_pRegUserDict->replace(notify,new TQString(u->name()));
 					notify = "";
 				}
 			}
@@ -624,7 +624,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 			// check if we have a cached tqmask
 			if(db)
 			{
-				if(KviIrcUserEntry * ue = db->tqfind(*s))
+				if(KviIrcUserEntry * ue = db->find(*s))
 				{
 					// already in the db... do we have a tqmask ?
 					if(ue->hasUser() && ue->hasHost())
@@ -658,7 +658,7 @@ bool KviIsOnNotifyListManager::handleIsOn(KviIrcMessage *msg)
 
 bool KviIsOnNotifyListManager::doMatchUser(const TQString &notifyString,const KviIrcMask & tqmask)
 {
-	TQString * nam = m_pRegUserDict->tqfind(notifyString);
+	TQString * nam = m_pRegUserDict->find(notifyString);
 	if(nam)
 	{
 		// ok...find the user
@@ -980,7 +980,7 @@ bool KviStupidNotifyListManager::handleIsOn(KviIrcMessage * msg)
 		{
 			TQString nkd = m_pConnection->decodeText(nk.ptr());
 			TQString nksp = " " + nkd;
-			m_szLastIsOnMsg.tqreplace(nksp,"",false);
+			m_szLastIsOnMsg.replace(nksp,"",false);
 			if(!(m_pConsole->notifyListView()->findEntry(nkd)))
 			{
 				// not yet notified
@@ -1097,7 +1097,7 @@ void KviWatchNotifyListManager::buildRegUserDict()
 			TQStringList sl = TQStringList::split(' ',notify);
 			for(TQStringList::Iterator it = sl.begin();it != sl.end();++it)
 			{
-				m_pRegUserDict->tqreplace(*it,new TQString(u->name()));
+				m_pRegUserDict->replace(*it,new TQString(u->name()));
 			}
 		}
 		++it;
@@ -1116,7 +1116,7 @@ void KviWatchNotifyListManager::start()
 	while(it.current())
 	{
 		TQString nk = it.currentKey();
-		if(nk.tqfind('*') == -1)
+		if(nk.find('*') == -1)
 		{
 			if((watchStr.length() + nk.length() + 2) > 501)
 			{
@@ -1148,7 +1148,7 @@ void KviWatchNotifyListManager::stop()
 
 bool KviWatchNotifyListManager::doMatchUser(KviIrcMessage * msg,const TQString &notifyString,const KviIrcMask & tqmask)
 {
-	TQString * nam = m_pRegUserDict->tqfind(notifyString);
+	TQString * nam = m_pRegUserDict->find(notifyString);
 
 	if(nam)
 	{
@@ -1247,7 +1247,7 @@ bool KviWatchNotifyListManager::handleWatchReply(KviIrcMessage *msg)
 			if(_OUTPUT_VERBOSE)
 				m_pConsole->output(KVI_OUT_SYSTEMMESSAGE,__tr2qs("Notify list: Stopped watching for \r!n\r%Q\r"),&dnk);
 		}
-		if(m_pRegUserDict->tqfind(dnk))m_pRegUserDict->remove(dnk); // kill that
+		if(m_pRegUserDict->find(dnk))m_pRegUserDict->remove(dnk); // kill that
 
 		return true;
 
diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp
index 32962220..d741bfd6 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/kvi_texticonmanager.cpp
@@ -91,13 +91,13 @@ void KviTextIconManager::clear()
 
 void KviTextIconManager::insert(const TQString &name,int id)
 {
-	m_pTextIconDict->tqreplace(name,new KviTextIcon(id));
+	m_pTextIconDict->replace(name,new KviTextIcon(id));
 	emit changed();
 }
 
 void KviTextIconManager::insert(const TQString &name,KviTextIcon& icon)
 {
-	m_pTextIconDict->tqreplace(name,new KviTextIcon(&icon));
+	m_pTextIconDict->replace(name,new KviTextIcon(&icon));
 	emit changed();
 }
 
@@ -129,7 +129,7 @@ void KviTextIconManager::checkDefaultAssociations()
 {
 	for(int i=0;default_associations[i].name;i++)
 	{
-		if(!m_pTextIconDict->tqfind(default_associations[i].name))
+		if(!m_pTextIconDict->find(default_associations[i].name))
 			insert(TQString::fromUtf8(default_associations[i].name),default_associations[i].iVal);
 	}
     emit changed();
@@ -172,7 +172,7 @@ int KviTextIconManager::load(const TQString &filename,bool bMerge)
 	cfg.setGroup("Manager");
 	int upd = cfg.readIntEntry("ConfigUpdate",0);
 
-	KviConfigGroup * dict = cfg.dict()->tqfind("TextIcons");
+	KviConfigGroup * dict = cfg.dict()->find("TextIcons");
 	if(dict)
 	{
 		KviConfigGroupIterator it(*dict);
@@ -209,16 +209,16 @@ int KviTextIconManager::load(const TQString &filename,bool bMerge)
 			{
 				if(bMerge)
 				{
-					if(!m_pTextIconDict->tqfind(*s))
+					if(!m_pTextIconDict->find(*s))
 						if(id!=-1)
-							m_pTextIconDict->tqreplace(*s,new KviTextIcon(id));
+							m_pTextIconDict->replace(*s,new KviTextIcon(id));
 						else
-							m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp));
+							m_pTextIconDict->replace(*s,new KviTextIcon(szTmp));
 				} else {
 					if(id!=-1)
-						m_pTextIconDict->tqreplace(*s,new KviTextIcon(id));
+						m_pTextIconDict->replace(*s,new KviTextIcon(id));
 					else
-						m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp));
+						m_pTextIconDict->replace(*s,new KviTextIcon(szTmp));
 				}
 			}
 		}
diff --git a/src/kvirc/kernel/kvi_texticonmanager.h b/src/kvirc/kernel/kvi_texticonmanager.h
index 83580146..0083b603 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.h
+++ b/src/kvirc/kernel/kvi_texticonmanager.h
@@ -70,7 +70,7 @@ public:
 	void clear();
 	void insert(const TQString &name,int id);
 	void insert(const TQString &name,KviTextIcon& icon);
-	KviTextIcon * lookupTextIcon(const TQString &name){ return m_pTextIconDict->tqfind(name); };
+	KviTextIcon * lookupTextIcon(const TQString &name){ return m_pTextIconDict->find(name); };
 	void load();
 	void save();
 protected:
diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp
index 07849cf1..6de11108 100644
--- a/src/kvirc/kernel/kvi_userinput.cpp
+++ b/src/kvirc/kernel/kvi_userinput.cpp
@@ -80,14 +80,14 @@ namespace KviUserInput
 			static TQString szUserFriendlyCommandlineContext(__tr2qs("commandline::userfriendly"));
 			TQString szCmd=szData;
 			// escape any -$;\%(
-			szCmd.tqreplace("\\","\\\\");
-			szCmd.tqreplace("\"","\\\"");
-			szCmd.tqreplace("$","\\$");
-			szCmd.tqreplace("%","\\%");
-			szCmd.tqreplace("(","\\(");
-			szCmd.tqreplace(";","\\;");
-			szCmd.tqreplace("-","\\-");
-			szCmd.tqreplace("+","\\+");
+			szCmd.replace("\\","\\\\");
+			szCmd.replace("\"","\\\"");
+			szCmd.replace("$","\\$");
+			szCmd.replace("%","\\%");
+			szCmd.replace("(","\\(");
+			szCmd.replace(";","\\;");
+			szCmd.replace("-","\\-");
+			szCmd.replace("+","\\+");
 			KviKvsScript kvs(szContext.isEmpty() ? szUserFriendlyCommandlineContext : szContext,szCmd);
 			return (kvs.run(pWindow,0,0) != KviKvsScript::Error);
 		} else {
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.h b/src/kvirc/kvs/kvi_kvs_aliasmanager.h
index 49fda27a..5f503ded 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.h
@@ -48,9 +48,9 @@ public:
 
 	KviPointerHashTable<TQString,KviKvsScript> * aliasDict(){ return m_pAliasDict; };
 	const KviKvsScript * lookup(const TQString & szName)
-		{ return m_pAliasDict->tqfind(szName); };
+		{ return m_pAliasDict->find(szName); };
 	void add(const TQString &szName,KviKvsScript * pAlias)
-		{ m_pAliasDict->tqreplace(szName,pAlias); };
+		{ m_pAliasDict->replace(szName,pAlias); };
 	bool remove(const TQString & szName)
 		{ return m_pAliasDict->remove(szName); };
 	void clear()
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index e9254926..398fabdb 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -143,8 +143,8 @@ namespace KviKvsCoreCallbackCommands
 		KVSCCC_PARAMETERS_END
 
 		KviDns::QueryType queryType = KviDns::IpV4;
-		if(KVSCCC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6;
-		if(KVSCCC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any;
+		if(KVSCCC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6;
+		if(KVSCCC_pSwitches->find('a',"any"))queryType = KviDns::Any;
 
 		KviKvsVariant * pMagic = pMagicPtr ? new KviKvsVariant(*pMagicPtr) : new KviKvsVariant();
 
@@ -256,14 +256,14 @@ namespace KviKvsCoreCallbackCommands
 		
 		// make sure that we have only doubled "::" and not ":" or ":::..."
 		TQString tmp = szName;
-		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)
 		{
 			KVSCCC_pContext->error(__tr2qs("Stray ':' character in alias name: did you mean ...<namespace>::<name> ?"));
 			return false;
 		}
 
-		if(tmp.tqfind("@@") != -1)
+		if(tmp.find("@@") != -1)
 		{
 			KVSCCC_pContext->error(__tr2qs("Found an empty namespace in alias name"));
 			return false;
@@ -273,7 +273,7 @@ namespace KviKvsCoreCallbackCommands
 		{
 			if(!KviKvsAliasManager::instance()->remove(szName))
 			{
-				if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCCC_pSwitches->find('q',"quiet"))
 					KVSCCC_pContext->warning(__tr2qs("The alias %Q is not existing"),&szName);
 			}
 		} else {
@@ -359,7 +359,7 @@ namespace KviKvsCoreCallbackCommands
 
 		KVSCCC_pConnection->asyncWhoisData()->add(info);
 
-		if(KVSCCC_pSwitches->tqfind('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data());
+		if(KVSCCC_pSwitches->find('i',"idle-time"))KVSCCC_pConnection->sendFmtData("WHOIS %s %s",szN.data(),szN.data());
 		else KVSCCC_pConnection->sendFmtData("WHOIS %s",szN.data());
 
 		return true;
@@ -432,7 +432,7 @@ namespace KviKvsCoreCallbackCommands
 
 		if(!KVSCCC_pWindow->buttonContainer())
 		{
-			if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+			if(!KVSCCC_pSwitches->find('q',"quiet"))
 				KVSCCC_pContext->warning(__tr2qs("The specified window has no button containers"));
 			return true;
 		}
@@ -443,7 +443,7 @@ namespace KviKvsCoreCallbackCommands
 		{
 			if(pButton)delete pButton;
 			else {
-				if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCCC_pSwitches->find('q',"quiet"))
 					KVSCCC_pContext->warning(__tr2qs("Window button '%Q' not found"),&szName);
 			}
 			return true;
@@ -471,12 +471,12 @@ namespace KviKvsCoreCallbackCommands
 			{
 				pButton->setButtonPixmap(*pix);
 			} else {
-				if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCCC_pSwitches->find('q',"quiet"))
 					KVSCCC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&szIcon);
 			}
 		}
 	
-		pButton->setEnabled(!(KVSCCC_pSwitches->tqfind('d',"disabled")));
+		pButton->setEnabled(!(KVSCCC_pSwitches->find('d',"disabled")));
 	
 		return true;
 	}
@@ -528,7 +528,7 @@ namespace KviKvsCoreCallbackCommands
 		{
 			if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber))
 			{
-				if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCCC_pSwitches->find('q',"quiet"))
 					KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName);
 				return true;
 			}
@@ -536,7 +536,7 @@ namespace KviKvsCoreCallbackCommands
 			iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName);
 			if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber))
 			{
-				if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCCC_pSwitches->find('q',"quiet"))
 					KVSCCC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName);
 				return true;
 			}
@@ -548,13 +548,13 @@ namespace KviKvsCoreCallbackCommands
 			{
 				if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName))
 				{
-					if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+					if(!KVSCCC_pSwitches->find('q',"quiet"))
 						KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber);
 				}
 			} else {
 				if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName))
 				{
-					if(!KVSCCC_pSwitches->tqfind('q',"quiet"))
+					if(!KVSCCC_pSwitches->find('q',"quiet"))
 						KVSCCC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName);
 				}
 			}
@@ -679,7 +679,7 @@ namespace KviKvsCoreCallbackCommands
 			The stderr data event is similar to the stdout one but there are three differences.
 			The first one is that the stderr event is NOT triggered by default: you must
 			use the -e switch to enable it. The second difference is that $0
-			tqcontains "stderr" instead of "stdout". The last difference is that $1 contains data
+			contains "stderr" instead of "stdout". The last difference is that $1 contains data
 			coming from the slave process stderr stream.[br]
 			[br]
 			[b]Termination event[/b][br]
@@ -914,13 +914,13 @@ namespace KviKvsCoreCallbackCommands
 
 		int f = 0;
 		
-		if(KVSCCC_pSwitches->tqfind('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED;
-		if(KVSCCC_pSwitches->tqfind('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT;
-		if(KVSCCC_pSwitches->tqfind('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR;
-		if(KVSCCC_pSwitches->tqfind('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED;
-		if(KVSCCC_pSwitches->tqfind('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS;
-		if(KVSCCC_pSwitches->tqfind('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW;
-		if(KVSCCC_pSwitches->tqfind('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL;
+		if(KVSCCC_pSwitches->find('t',"trigger-termination") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERTERMINATED;
+		if(KVSCCC_pSwitches->find('n',"no-stdout") == 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDOUT;
+		if(KVSCCC_pSwitches->find('e',"trigger-stderr") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTDERR;
+		if(KVSCCC_pSwitches->find('x',"trigger-startup") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_TRIGGERSTARTED;
+		if(KVSCCC_pSwitches->find('b',"output-block") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_OUTPUTBYBLOCKS;
+		if(KVSCCC_pSwitches->find('w',"bind-to-window") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_KILLIFNOWINDOW;
+		if(KVSCCC_pSwitches->find('d',"direct") != 0)f |= KVI_KVS_PROCESSDESCRIPTOR_NOSHELL;
 
 		TQString szShell;
 		KVSCCC_pSwitches->getAsStringIfExisting('s',"shell",szShell);
@@ -928,7 +928,7 @@ namespace KviKvsCoreCallbackCommands
 		kvs_int_t iPingTime = 0;
 		kvs_int_t iMaxRunTime = 0;
 
-		KviKvsVariant * pPing = KVSCCC_pSwitches->tqfind('p',"trigger-ping");
+		KviKvsVariant * pPing = KVSCCC_pSwitches->find('p',"trigger-ping");
 		if(pPing)
 		{
 			if(!(pPing->asInteger(iPingTime) && iPingTime > 0))
@@ -938,7 +938,7 @@ namespace KviKvsCoreCallbackCommands
 			}
 		}
 
-		KviKvsVariant * pKill = KVSCCC_pSwitches->tqfind('k',"kill-after");
+		KviKvsVariant * pKill = KVSCCC_pSwitches->find('k',"kill-after");
 		if(pKill)
 		{
 			if(!(pKill->asInteger(iMaxRunTime) && iMaxRunTime > 0))
@@ -962,7 +962,7 @@ namespace KviKvsCoreCallbackCommands
 		KviKvsProcessAsyncOperation * op = new KviKvsProcessAsyncOperation(d);
 		if(!op->start())
 		{
-			if(KVSCCC_pSwitches->tqfind('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process"));
+			if(KVSCCC_pSwitches->find('q',"quiet") == 0)KVSCCC_pContext->warning(__tr2qs("Failed to start the process"));
 			delete op;
 		}
 	
@@ -1132,8 +1132,8 @@ namespace KviKvsCoreCallbackCommands
 
 		KviKvsTimer::Lifetime lt;
 
-		if(KVSCCC_pSwitches->tqfind('s',"single-shot"))lt = KviKvsTimer::SingleShot;
-		else if(KVSCCC_pSwitches->tqfind('p',"persistent"))lt = KviKvsTimer::Persistent;
+		if(KVSCCC_pSwitches->find('s',"single-shot"))lt = KviKvsTimer::SingleShot;
+		else if(KVSCCC_pSwitches->find('p',"persistent"))lt = KviKvsTimer::Persistent;
 		else lt = KviKvsTimer::WindowLifetime;
 
 		// prepare the callback parameters
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
index 508ec52d..60fbe440 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
@@ -784,7 +784,7 @@ namespace KviKvsCoreFunctions
 			{
 				//Check for right Characters
 				#ifdef COMPILE_ON_WINDOWS
-					if (szAllowedCharacters.tqfind((char)(c->tqunicode()),0,true) >= 0)	tmpFormat += '%';
+					if (szAllowedCharacters.find((char)(c->tqunicode()),0,true) >= 0)	tmpFormat += '%';
 				#else
 					if (c->isLetter()) tmpFormat += '%';
 				#endif
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
index 4e9f3c72..e8aae4f6 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
@@ -182,7 +182,7 @@ namespace KviKvsCoreFunctions
 		{
 			if(KVSCF_pContext->window()->console()->isConnected())
 			{
-				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick);
+				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick);
 				if(e)
 				{
 					KVSCF_pRetBuffer->setString(e->host());
@@ -678,7 +678,7 @@ namespace KviKvsCoreFunctions
 		{
 			if(KVSCF_pContext->window()->console()->isConnected())
 			{
-				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick);
+				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick);
 				if(e)
 				{
 					KVSCF_pRetBuffer->setBoolean(e->hasHost() && e->hasUser());
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
index 459f0249..4fb92ce3 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
@@ -118,7 +118,7 @@ namespace KviKvsCoreFunctions
 		{
 			if(KVSCF_pContext->window()->console()->isConnected())
 			{
-				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick);
+				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick.isEmpty() ? KVSCF_pContext->window()->connection()->currentNickName() : szNick);
 				if(e)
 				{
 					KviIrcMask u;
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
index 8b4ef73c..a5478dce 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
@@ -399,14 +399,14 @@ namespace KviKvsCoreFunctions
 		if(szSwitch.length() > 1)
 		{
 			if(szLongSwitch.isEmpty())
-				v = sl->tqfind(szSwitch);
+				v = sl->find(szSwitch);
 			else
-				v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch);
+				v = sl->find(szSwitch[0].tqunicode(),szLongSwitch);
 		}else {
 			if(szLongSwitch.isEmpty())
-				v = sl->tqfind(szSwitch[0]);
+				v = sl->find(szSwitch[0]);
 			else
-				v = sl->tqfind(szSwitch[0].tqunicode(),szLongSwitch);
+				v = sl->find(szSwitch[0].tqunicode(),szLongSwitch);
 		}
 
 		if(v)KVSCF_pRetBuffer->copyFrom(*v);
@@ -981,7 +981,7 @@ namespace KviKvsCoreFunctions
 		{
 			if(KVSCF_pContext->window()->console()->isConnected())
 			{
-				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->tqfind(szNick);
+				KviIrcUserEntry * e = KVSCF_pContext->window()->connection()->userDataBase()->find(szNick);
 				if(e)
 				{
 					KVSCF_pRetBuffer->setString(e->user());
@@ -1035,9 +1035,9 @@ namespace KviKvsCoreFunctions
 		if(szType.isEmpty())
 			KVSCF_pRetBuffer->setString(KVI_VERSION);
 		else {
-			if(szType.tqfind('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME);
-			else if(szType.tqfind('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE);
-			else if(szType.tqfind('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE);
+			if(szType.find('r') != -1)KVSCF_pRetBuffer->setString(KVI_RELEASE_NAME);
+			else if(szType.find('s') != -1)KVSCF_pRetBuffer->setString(KVI_SOURCES_DATE);
+			else if(szType.find('b') != -1)KVSCF_pRetBuffer->setString(KVI_BUILD_DATE);
 			else KVSCF_pRetBuffer->setString(KVI_VERSION);
 		}
 		return true;
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index c79e832f..e46af6e4 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -122,7 +122,7 @@ namespace KviKvsCoreSimpleCommands
 
 		if(szReason.isEmpty())szReason = KVI_OPTION_STRING(KviOption_stringAwayMessage);
 	
-		if(KVSCSC_pSwitches->tqfind('a',"all-networks"))
+		if(KVSCSC_pSwitches->find('a',"all-networks"))
 		{
 			KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 			while(KviWindow * wnd = it.current())
@@ -176,7 +176,7 @@ namespace KviKvsCoreSimpleCommands
 	KVSCSC(back)
 	{
 		
-		if(KVSCSC_pSwitches->tqfind('a',"all-networks"))
+		if(KVSCSC_pSwitches->find('a',"all-networks"))
 		{
 			KviPointerHashTableIterator<const char *,KviWindow> it(*g_pGlobalWindowDict);
 			while(KviWindow * wnd = it.current())
@@ -291,10 +291,10 @@ namespace KviKvsCoreSimpleCommands
 
 		kvs_int_t pitch    = -1;
 		kvs_int_t duration = -1;
-		bool bSync   = (KVSCSC_pSwitches->tqfind('s',"sync") != 0);
+		bool bSync   = (KVSCSC_pSwitches->find('s',"sync") != 0);
 		bool bOk = false;
 
-		KviKvsVariant * pPitch = KVSCSC_pSwitches->tqfind('p',"pitch");
+		KviKvsVariant * pPitch = KVSCSC_pSwitches->find('p',"pitch");
 		if(pPitch)
 		{
 			if(!pPitch->asInteger(pitch))
@@ -304,7 +304,7 @@ namespace KviKvsCoreSimpleCommands
 			}
 		}
 
-		KviKvsVariant * pDuration = KVSCSC_pSwitches->tqfind('d',"duration");
+		KviKvsVariant * pDuration = KVSCSC_pSwitches->find('d',"duration");
 		if(pDuration)
 		{
 			if(!pDuration->asInteger(duration))
@@ -410,7 +410,7 @@ namespace KviKvsCoreSimpleCommands
 
 		if(!KVSCSC_pWindow->buttonContainer())
 		{
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers"));
+			if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The specified window has no button containers"));
 			return true;
 		}
 	
@@ -418,7 +418,7 @@ namespace KviKvsCoreSimpleCommands
 
 		if(!pButton)
 		{
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName);
+			if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No button with type %Q named %Q"),&tbTypeUnused,&tbName);
 			return true;
 		}
 		TQChar o;
@@ -442,7 +442,7 @@ namespace KviKvsCoreSimpleCommands
 					{
 						pButton->setButtonPixmap(*pix);
 					} else {
-						if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar);
+						if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Can't find the icon '%Q'"),&tbPar);
 					}
 				}
 			break;
@@ -527,7 +527,7 @@ namespace KviKvsCoreSimpleCommands
 		KviTQCString szD = KVSCSC_pConnection->encodeText(szCtcpData);
 	
 		if(!(KVSCSC_pConnection->sendFmtData("%s %s :%c%s%c",
-				KVSCSC_pSwitches->tqfind('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01)))
+				KVSCSC_pSwitches->find('n',"notice") ? "NOTICE" : "PRIVMSG",szT.data(),0x01,szD.data(),0x01)))
 			return KVSCSC_pContext->warningNoIrcConnection();
 
 		return true;
@@ -628,16 +628,16 @@ namespace KviKvsCoreSimpleCommands
 		KVSCSC_PARAMETERS_END
 		if(hObject == (kvs_hobject_t)0)
 		{
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+			if(!KVSCSC_pSwitches->find('q',"quiet"))
 				KVSCSC_pContext->warning(__tr2qs("Can't delete a null object reference"));
 		} else {
 			KviKvsObject * o = KviKvsKernel::instance()->objectController()->lookupObject(hObject);
 			if(!o)
 			{
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("Can't delete an inexisting object"));
 			} else {
-				if(KVSCSC_pSwitches->tqfind('i',"immediate"))
+				if(KVSCSC_pSwitches->find('i',"immediate"))
 					o->dieNow();
 				else
 					o->die();
@@ -688,7 +688,7 @@ namespace KviKvsCoreSimpleCommands
 		KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName);
 		if(!p)
 		{
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+			if(!KVSCSC_pSwitches->find('q',"quiet"))
 				KVSCSC_pContext->warning(__tr2qs("Inexisting popup \"%Q\""),&szPopupName);
 			return true;
 		}
@@ -699,9 +699,9 @@ namespace KviKvsCoreSimpleCommands
 			return false;
 		}
 	
-		if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->tqfind('d',"deep")))
+		if(!p->removeItemByName(szItemId,KVSCSC_pSwitches->find('d',"deep")))
 		{
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+			if(!KVSCSC_pSwitches->find('q',"quiet"))
 				KVSCSC_pContext->warning(__tr2qs("The menu item with id \"%Q\" does not exist in popup \"%Q\""),&szItemId,&szPopupName);
 		}
 	
@@ -849,7 +849,7 @@ namespace KviKvsCoreSimpleCommands
 		if(!KVSCSC_pSwitches->isEmpty())
 		{
 			KviKvsVariant * v;
-			if((v = KVSCSC_pSwitches->tqfind('w',"window")))
+			if((v = KVSCSC_pSwitches->find('w',"window")))
 			{
 				TQString szWnd;
 				v->asString(szWnd);
@@ -862,7 +862,7 @@ namespace KviKvsCoreSimpleCommands
 				}
 			}
 				
-			if((v = KVSCSC_pSwitches->tqfind('i',"icon")))
+			if((v = KVSCSC_pSwitches->find('i',"icon")))
 			{
 				if(!v->asInteger(iMsgType))
 				{
@@ -873,13 +873,13 @@ namespace KviKvsCoreSimpleCommands
 				}
 			}
 			
-			if(KVSCSC_pSwitches->tqfind('d',"debug"))
+			if(KVSCSC_pSwitches->find('d',"debug"))
 			{
 				pWnd = KviDebugWindow::getInstance();
 			}
 		}
 
-		int iFlags = KVSCSC_pSwitches->tqfind('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0;
+		int iFlags = KVSCSC_pSwitches->find('n',"no-timestamp") ? KviIrcView::NoTimestamp : 0;
 		pWnd->outputNoFmt(iMsgType,szAll,iFlags);
 		return true;
 	}
@@ -971,7 +971,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KviKvsVariant * v;
 
-		if(v = KVSCSC_pSwitches->tqfind('i',"color-set"))
+		if(v = KVSCSC_pSwitches->find('i',"color-set"))
 		{
 			kvs_int_t msgType;
 			if(v->asInteger(msgType))
@@ -981,7 +981,7 @@ namespace KviKvsCoreSimpleCommands
 			} else KVSCSC_pContext->warning(__tr2qs("Invalid color-set specification, using default"));
 		}
 
-		if(v = KVSCSC_pSwitches->tqfind('w',"window"))
+		if(v = KVSCSC_pSwitches->find('w',"window"))
 		{
 			TQString szWin;
 			v->asString(szWin);
@@ -998,21 +998,21 @@ namespace KviKvsCoreSimpleCommands
 		bool bPrefix = false;
 		bool bSuffix = false;
 
-		if(v = KVSCSC_pSwitches->tqfind('p',"prefix"))
+		if(v = KVSCSC_pSwitches->find('p',"prefix"))
 		{
 			v->asString(szPrefix);
 			bPrefix = true;
 		}
-		if(v = KVSCSC_pSwitches->tqfind('s',"suffix"))
+		if(v = KVSCSC_pSwitches->find('s',"suffix"))
 		{
 			v->asString(szSuffix);
 			bSuffix = true;
 		}
 
 		int iFlags = 0;
-		if(KVSCSC_pSwitches->tqfind('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting;
-		if(KVSCSC_pSwitches->tqfind('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing;
-		if(KVSCSC_pSwitches->tqfind('x',"no-notifier"))iFlags |= KviConsole::NoNotifier;
+		if(KVSCSC_pSwitches->find('n',"no-highlighting"))iFlags |= KviConsole::NoHighlighting;
+		if(KVSCSC_pSwitches->find('f',"no-flashing"))iFlags |= KviConsole::NoWindowFlashing;
+		if(KVSCSC_pSwitches->find('x',"no-notifier"))iFlags |= KviConsole::NoNotifier;
 		
 		pConsole->outputPrivmsg(pWnd,type,
 				szNick,szUser,szHost,szText,
@@ -1121,12 +1121,12 @@ namespace KviKvsCoreSimpleCommands
 
 		KviKvsScript s("eval::inner",szCommands);
 		int iRunFlags = 0;
-		if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->tqfind('q',"quiet"))
+		if(KVSCSC_pContext->reportingDisabled() || KVSCSC_pSwitches->find('q',"quiet"))
 			iRunFlags |= KviKvsScript::Quiet;
 		bool bRet = s.run(KVSCSC_pContext,iRunFlags) ? true : false;
 		if(!bRet)
 		{
-			if(!KVSCSC_pSwitches->tqfind('f',"force"))
+			if(!KVSCSC_pSwitches->find('f',"force"))
 				return false;
 			KVSCSC_pContext->clearError();
 		}
@@ -1185,7 +1185,7 @@ namespace KviKvsCoreSimpleCommands
 		{
 			if(!KviKvsEventManager::instance()->isValidRawEvent(iNumber))
 			{
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName);
 				return true;
 			}
@@ -1193,36 +1193,36 @@ namespace KviKvsCoreSimpleCommands
 			iNumber = KviKvsEventManager::instance()->findAppEventIndexByName(szEventName);
 			if(!KviKvsEventManager::instance()->isValidAppEvent(iNumber))
 			{
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("No such event (%Q)"),&szEventName);
 				return true;
 			}
 		}
 
-		if(KVSCSC_pSwitches->tqfind('u',"unregister"))
+		if(KVSCSC_pSwitches->find('u',"unregister"))
 		{
 			// unregister it
 			if(bIsRaw)
 			{
 				if(!KviKvsEventManager::instance()->removeScriptRawHandler(iNumber,szHandlerName))
-					if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+					if(!KVSCSC_pSwitches->find('q',"quiet"))
 						KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber);
 			} else {
 				if(!KviKvsEventManager::instance()->removeScriptAppHandler(iNumber,szHandlerName))
-					if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+					if(!KVSCSC_pSwitches->find('q',"quiet"))
 						KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName);
 			}
-		} else if(KVSCSC_pSwitches->tqfind('e',"enable") || KVSCSC_pSwitches->tqfind('d',"disable"))
+		} else if(KVSCSC_pSwitches->find('e',"enable") || KVSCSC_pSwitches->find('d',"disable"))
 		{
 			// enable it
 			if(bIsRaw)
 			{
-				if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable")))
-					if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KviKvsEventManager::instance()->enableScriptRawHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable")))
+					if(!KVSCSC_pSwitches->find('q',"quiet"))
 						KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for raw numeric event '%d'"),&szHandlerName,iNumber);
 			} else {
-				if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->tqfind('e',"enable")))
-					if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KviKvsEventManager::instance()->enableScriptAppHandler(iNumber,szHandlerName,KVSCSC_pSwitches->find('e',"enable")))
+					if(!KVSCSC_pSwitches->find('q',"quiet"))
 						KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName);
 			}
 		} else {
@@ -1244,7 +1244,7 @@ namespace KviKvsCoreSimpleCommands
 				KviKvsVariant retVal;
 				copy.run(KVSCSC_pWindow,&vList,0,KviKvsScript::PreserveParams);
 			} else {
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("No handler '%Q' for event '%Q'"),&szHandlerName,&szEventName);
 			}
 		}
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 43222d44..fcb2b03c 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -291,8 +291,8 @@ try_again:
 		KVSCSC_PARAMETERS_END
 
 		KviDns::QueryType queryType = KviDns::IpV4;
-		if(KVSCSC_pSwitches->tqfind('i',"ipv6"))queryType = KviDns::IpV6;
-		if(KVSCSC_pSwitches->tqfind('a',"any"))queryType = KviDns::Any;
+		if(KVSCSC_pSwitches->find('i',"ipv6"))queryType = KviDns::IpV6;
+		if(KVSCSC_pSwitches->find('a',"any"))queryType = KviDns::Any;
 
 		KviKvsAsyncDnsOperation * op = new KviKvsAsyncDnsOperation(
 						KVSCSC_pContext->window(),
@@ -518,7 +518,7 @@ try_again:
 			KVSCSC_PARAMETER("name",KVS_PT_STRING,KVS_PF_OPTIONAL,szName)
 		KVSCSC_PARAMETERS_END
 
-		if(KVSCSC_pSwitches->tqfind('a',"active"))
+		if(KVSCSC_pSwitches->find('a',"active"))
 		{
 			KviKvsTimerManager::instance()->deleteAllTimers();
 			return true;
@@ -528,13 +528,13 @@ try_again:
 		{
 			if(!KviKvsTimerManager::instance()->deleteCurrentTimer())
 			{
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("Timer name omitted but there is not current timer (this is not a timer callback)"));
 			}
 		} else {
 			if(!KviKvsTimerManager::instance()->deleteTimer(szName))
 			{
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("Can't kill the timer '%Q' since it is not running"),&szName);
 			}
 		}
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index 9744b6fd..e79fb9bd 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -278,7 +278,7 @@ namespace KviKvsCoreSimpleCommands
 		if(!(KVSCSC_pConnection->sendFmtData("NOTICE %s :%s",szT.data(),szD.data())))
 			return KVSCSC_pContext->warningNoIrcConnection();
 
-		if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+		if(!KVSCSC_pSwitches->find('q',"quiet"))
 			KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[NOTICE >>> %Q]: %Q",&szTarget,&szText);
 
 		return true;
@@ -634,12 +634,12 @@ namespace KviKvsCoreSimpleCommands
 		TQString szBuffer;
 		if(!KviFileUtils::loadFile(szFileName,szBuffer,true)) // <-- scripts SHOULD be shipped in utf8 format
 		{
-			if(KVSCSC_pSwitches->tqfind('e',"fail-on-load"))
+			if(KVSCSC_pSwitches->find('e',"fail-on-load"))
 			{
 				KVSCSC_pContext->error(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName);
 				return false;
 			} else {
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("Failed to load the file '%Q' for parsing"),&szFileName);
 				return true;
 			}
@@ -647,7 +647,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KviKvsScript s(szFileName,szBuffer);
 
-		KviKvsVariant * pRetVal = KVSCSC_pSwitches->tqfind('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0;
+		KviKvsVariant * pRetVal = KVSCSC_pSwitches->find('r',"propagate-return") ? KVSCSC_pContext->returnValue() : 0;
 		KviKvsVariant vFileName(szFileName);
 		vList.prepend(&vFileName);
 
@@ -655,7 +655,7 @@ namespace KviKvsCoreSimpleCommands
 
 		if(!s.run(KVSCSC_pContext->window(),&vList,pRetVal,KviKvsScript::PreserveParams,&rtd))
 		{
-			if(KVSCSC_pSwitches->tqfind('f',"fail-on-error"))return false;
+			if(KVSCSC_pSwitches->find('f',"fail-on-error"))return false;
 		}
 		return true;
 	}
@@ -712,7 +712,7 @@ namespace KviKvsCoreSimpleCommands
 			if(KVSCSC_pWindow->type() == KVI_WINDOW_TYPE_CHANNEL)
 				szChans = KVSCSC_pWindow->target();
 			else {
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list"));
+				if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("Missing channel list"));
 				return true;
 			}
 		}
@@ -748,9 +748,9 @@ namespace KviKvsCoreSimpleCommands
 			KviChannel * ch = KVSCSC_pConnection->findChannel(*it);
 			if(ch)
 			{
-				ch->partMessageSent(!KVSCSC_pSwitches->tqfind('k',"keep"),!KVSCSC_pSwitches->tqfind('s',"silent"));
+				ch->partMessageSent(!KVSCSC_pSwitches->find('k',"keep"),!KVSCSC_pSwitches->find('s',"silent"));
 			} else {
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data());
+				if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("You don't appear to be on channel %s"),(*it).utf8().data());
 			}
 		}
 
@@ -875,13 +875,13 @@ namespace KviKvsCoreSimpleCommands
 
 		TQPoint pnt = TQCursor::pos();
 
-		KviKvsVariant * pCoords = KVSCSC_pSwitches->tqfind('p',"point");
+		KviKvsVariant * pCoords = KVSCSC_pSwitches->find('p',"point");
 		if(pCoords)
 		{
 			TQString szCoords;
 			pCoords->asString(szCoords);
 
-			int idx = szCoords.tqfind(',');
+			int idx = szCoords.find(',');
 			bool bCoordsOk = true;
 			if(idx == -1)bCoordsOk = false;
 			else {
@@ -956,7 +956,7 @@ namespace KviKvsCoreSimpleCommands
 			if(!(KVSCSC_pConnection->sendFmtData("PRIVMSG %s :%s",szT.data(),szD.data())))
 				return KVSCSC_pContext->warningNoIrcConnection();
 
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+			if(!KVSCSC_pSwitches->find('q',"quiet"))
 				KVSCSC_pWindow->output(KVI_OUT_OWNPRIVMSG,"[PRIVMSG >>> %Q]: %Q",&szTarget,&szText);
 		}
 
@@ -1018,7 +1018,7 @@ namespace KviKvsCoreSimpleCommands
 					KviIrcUserDataBase * db = KVSCSC_pWindow->connection()->userDataBase();
 					if(db)
 					{
-						KviIrcUserEntry * e = db->tqfind(szNick);
+						KviIrcUserEntry * e = db->find(szNick);
 						if(e)
 						{
 							user = e->user();
@@ -1084,12 +1084,12 @@ namespace KviKvsCoreSimpleCommands
 			KVSCSC_PARAMETER("reason",KVS_PT_STRING,KVS_PF_OPTIONAL | KVS_PF_APPENDREMAINING,szReason)
 		KVSCSC_PARAMETERS_END
 
-		if(KVSCSC_pSwitches->tqfind('q',"quit"))
+		if(KVSCSC_pSwitches->find('q',"quit"))
 		{
 			TQTimer::singleShot(0,g_pApp,TQT_SLOT(quit()));
 		} else {
 			KVSCSC_RETQUIRE_CONNECTION
-			KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->tqfind('f',"force"),szReason,KVSCSC_pSwitches->tqfind('u',"unexpected"));
+			KVSCSC_pWindow->context()->terminateConnectionRequest(KVSCSC_pSwitches->find('f',"force"),szReason,KVSCSC_pSwitches->find('u',"unexpected"));
 		}	
 		return true;
 	}
@@ -1183,7 +1183,7 @@ namespace KviKvsCoreSimpleCommands
 		if(!KVSCSC_pConnection->sendData(szData.data()))
 			return KVSCSC_pContext->warningNoIrcConnection();
 
-		if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+		if(!KVSCSC_pSwitches->find('q',"quiet"))
 			KVSCSC_pWindow->output(KVI_OUT_RAW,__tr2qs("[RAW]: %Q"),&szRawCommand);
 
 		return true;
@@ -1233,7 +1233,7 @@ namespace KviKvsCoreSimpleCommands
 		KviWindow * pAux = g_pApp->findWindow(szWinId.utf8().data());
 		if(pAux)KVSCSC_pContext->setWindow(pAux);
 		else {
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+			if(!KVSCSC_pSwitches->find('q',"quiet"))
 				KVSCSC_pContext->warning(__tr2qs("Window with id %Q not found: no rebinding performed"),&szWinId);
 		}
 		return true;
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 9fbffbd7..5ee31b73 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -86,12 +86,12 @@ namespace KviKvsCoreSimpleCommands
 			KVSCSC_PARAMETER("text",KVS_PT_STRING,KVS_PF_APPENDREMAINING,szText)
 		KVSCSC_PARAMETERS_END
 
-		if(KVSCSC_pSwitches->tqfind('x',"allow-exec"))
+		if(KVSCSC_pSwitches->find('x',"allow-exec"))
 		{
 			// allow execution of commands
 			if(!KviUserInput::parse(szText,KVSCSC_pWindow,__tr2qs("say: injected commandline")))
 			{
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("Say parse error: Broken command"));
 			}
 		} else {
@@ -213,9 +213,9 @@ namespace KviKvsCoreSimpleCommands
 		KVSCSC_PARAMETERS_END
 
 		KviConsole * console = 0;
-		if(KVSCSC_pSwitches->tqfind('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole();
+		if(KVSCSC_pSwitches->find('n',"new-context"))console = KVSCSC_pWindow->frame()->createNewConsole();
 		else {
-			if(KVSCSC_pSwitches->tqfind('u',"unused-context"))
+			if(KVSCSC_pSwitches->find('u',"unused-context"))
 			{
 				// first try the current console
 				console = KVSCSC_pWindow->console();
@@ -261,7 +261,7 @@ namespace KviKvsCoreSimpleCommands
 				return false;
 			} else {
 				KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData();
-				d->bUseLastServerInContext = KVSCSC_pSwitches->tqfind('l',"last") != 0;
+				d->bUseLastServerInContext = KVSCSC_pSwitches->find('l',"last") != 0;
 				d->szCommandToExecAfterConnect = szCmd;
 				d->szBindAddress = szBindAddress;
 				d->szPass = szPassword;
@@ -273,13 +273,13 @@ namespace KviKvsCoreSimpleCommands
 		} else {
 			// server is not empty.
 			KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData();
-			d->bUseSSL = (KVSCSC_pSwitches->tqfind('s',"ssl") != 0);
+			d->bUseSSL = (KVSCSC_pSwitches->find('s',"ssl") != 0);
 			d->szServer = szServer;
 			d->uPort = (kvi_u32_t)uPort;
 			d->szLinkFilter = szSocketFilter;
 			d->bPortIsOk = (uPort > 0);
 #ifdef COMPILE_IPV6_SUPPORT
-			d->bUseIpV6 = (KVSCSC_pSwitches->tqfind('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer);
+			d->bUseIpV6 = (KVSCSC_pSwitches->find('i',"ipv6") != 0) || KviNetUtils::isValidStringIp_V6(szServer);
 #else
 			d->bUseIpV6 = false;
 #endif
@@ -367,20 +367,20 @@ namespace KviKvsCoreSimpleCommands
 		{
 			if(!(KVSCSC_pWindow->frame()->mainMenuBar()->removeMenu(szVisibleText)))
 			{
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName);
+				if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("No menu bar item with text '%Q'"),&szPopupName);
 			}
 			return true;
 		}
 
 		KviKvsPopupMenu * p = KviKvsPopupManager::instance()->lookup(szPopupName);
 		int idx = -1;
-		if(KviKvsVariant * pIdx = KVSCSC_pSwitches->tqfind('i',"index"))
+		if(KviKvsVariant * pIdx = KVSCSC_pSwitches->find('i',"index"))
 		{
 			kvs_int_t iIdx;
 			if(pIdx->asInteger(iIdx))
 				idx = iIdx;
 			else {
-				if(!KVSCSC_pSwitches->tqfind('q',"quiet"))
+				if(!KVSCSC_pSwitches->find('q',"quiet"))
 					KVSCSC_pContext->warning(__tr2qs("Invalid index specified: ignored"));
 			}
 		}
@@ -390,7 +390,7 @@ namespace KviKvsCoreSimpleCommands
 
 		if(p)KVSCSC_pWindow->frame()->mainMenuBar()->addMenu(szVisibleText,p,idx);
 		else {
-			if(!KVSCSC_pSwitches->tqfind('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName);
+			if(!KVSCSC_pSwitches->find('q',"quiet"))KVSCSC_pContext->warning(__tr2qs("The popup '%Q' is not defined"),&szPopupName);
 		}
 
 		return true;
@@ -702,7 +702,7 @@ namespace KviKvsCoreSimpleCommands
 		if(KviLocale::loadCatalogue(szCatalogue,szDir))
 			return true;
 
-		if(KVSCSC_pSwitches->tqfind('v',"verbose"))
+		if(KVSCSC_pSwitches->find('v',"verbose"))
 			KVSCSC_pContext->warning(__tr2qs("No catalogue %Q for the current language found"),&szCatalogue);
 
 		return true;
@@ -741,7 +741,7 @@ namespace KviKvsCoreSimpleCommands
 
 		if(!KviLocale::unloadCatalogue(szCatalogue))
 		{
-			if(KVSCSC_pSwitches->tqfind('v',"verbose"))
+			if(KVSCSC_pSwitches->find('v',"verbose"))
 				KVSCSC_pContext->warning(__tr2qs("The catalogue %Q was not loaded"),&szCatalogue);
 		}
 		return true;
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index 2170362a..478b7ad2 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -102,13 +102,13 @@ void KviKvsDnsManager::addDns(KviKvsDnsObject * pObject)
 		m_pDnsObjects = new KviPointerHashTable<void *,KviKvsDnsObject>;
 		m_pDnsObjects->setAutoDelete(true);
 	}
-	m_pDnsObjects->tqreplace(pObject->dns(),pObject);
+	m_pDnsObjects->replace(pObject->dns(),pObject);
 	connect(pObject->dns(),TQT_SIGNAL(lookupDone(KviDns *)),this,TQT_SLOT(dnsLookupTerminated(KviDns *)));
 }
 
 void KviKvsDnsManager::dnsLookupTerminated(KviDns * pDns)
 {
-	KviKvsDnsObject * o = m_pDnsObjects->tqfind(pDns);
+	KviKvsDnsObject * o = m_pDnsObjects->find(pDns);
 	if(!o)
 	{
 		debug("KviKvsDnsManager::dnsLookupTerminated(): can't find the KviKvsDnsObject structure");
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index e2bab770..a046dc3c 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -2107,7 +2107,7 @@ channel
 			$5 contains the original color/icon set of the message that depends on
 			the type of the message itself.[br]
 			Since the CTCP ACTION messages generally have different format of output
-			then for your convenience $6 tqcontains 1 if the message was caused by a
+			then for your convenience $6 contains 1 if the message was caused by a
 			CTCP ACTION and 0 otherwise.[br]
 			If you call [cmd]halt[/cmd] in this event the message output will be completely disabled
 			(thus, KVIrc assumes that YOU have provided the necessary output and feedback to the user).[br]
@@ -2967,7 +2967,7 @@ channel
 			channel
 		@description:
 			Triggered when a channel mode has been changed, AFTER all the mode specific events
-			were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 tqcontains
+			were triggered. $3 contains the unparsed mode flags (-o+b...) and $4 contains
 			the unparsed mode parameter string (you need to split it!).
 	*/
 	EVENT("OnChannelModeChange","$0 = sourcenick\n$1 = sourceusername\n$2 = sourcehost\n$3 = modeflags\n$4 = mode params"),
diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/kvi_kvs_hash.cpp
index 0d4c93f8..b0add785 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.cpp
+++ b/src/kvirc/kvs/kvi_kvs_hash.cpp
@@ -39,7 +39,7 @@ KviKvsHash::KviKvsHash(const KviKvsHash &h)
 	KviPointerHashTableIterator<TQString,KviKvsVariant> it(*(h.m_pDict));
 	while(it.current())
 	{
-		m_pDict->tqreplace(it.currentKey(),new KviKvsVariant(*(it.current())));
+		m_pDict->replace(it.currentKey(),new KviKvsVariant(*(it.current())));
 		++it;
 	}
 }
@@ -88,9 +88,9 @@ void KviKvsHash::serialize(TQString& result)
 
 KviKvsVariant * KviKvsHash::get(const TQString &szKey)
 {
-	KviKvsVariant * v = m_pDict->tqfind(szKey);
+	KviKvsVariant * v = m_pDict->find(szKey);
 	if(v)return v;
 	v = new KviKvsVariant();
-	m_pDict->tqreplace(szKey,v);
+	m_pDict->replace(szKey,v);
 	return v;
 }
diff --git a/src/kvirc/kvs/kvi_kvs_hash.h b/src/kvirc/kvs/kvi_kvs_hash.h
index 69ce6929..c7663cf3 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.h
+++ b/src/kvirc/kvs/kvi_kvs_hash.h
@@ -47,8 +47,8 @@ protected:
 	KviPointerHashTable<TQString,KviKvsVariant> * m_pDict;
 public:
 	void unset(const TQString &szKey){ m_pDict->remove(szKey); };
-	void set(const TQString &szKey,KviKvsVariant * pVal){ m_pDict->tqreplace(szKey,pVal); };
-	KviKvsVariant * tqfind(const TQString &szKey) const { return m_pDict->tqfind(szKey); };
+	void set(const TQString &szKey,KviKvsVariant * pVal){ m_pDict->replace(szKey,pVal); };
+	KviKvsVariant * find(const TQString &szKey) const { return m_pDict->find(szKey); };
 	KviKvsVariant * get(const TQString &szKey);
 
 	bool isEmpty() const { return m_pDict->isEmpty(); };
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp
index e16bed3b..4ec97bc0 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp
@@ -114,7 +114,7 @@ void KviKvsKernel::done()
 
 void KviKvsKernel::completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches)
 {
-	int idx = szCommandBegin.tqfind(TQChar('.'));
+	int idx = szCommandBegin.find(TQChar('.'));
 	if(idx == -1)
 	{
 		// no module name inside
@@ -157,7 +157,7 @@ void KviKvsKernel::completeModuleCommand(const TQString &szModuleName,const TQSt
 
 void KviKvsKernel::completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches)
 {
-	int idx = szFunctionBegin.tqfind(TQChar('.'));
+	int idx = szFunctionBegin.find(TQChar('.'));
 	if(idx == -1)
 	{
 		// no module name inside
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.h b/src/kvirc/kvs/kvi_kvs_kernel.h
index 7c15655f..51846f54 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.h
+++ b/src/kvirc/kvs/kvi_kvs_kernel.h
@@ -101,24 +101,24 @@ public:
 	KviKvsAsyncOperationManager * asyncOperationManager(){ return m_pAsyncOperationManager; };
 
 	void registerSpecialCommandParsingRoutine(const TQString &szCmdName,KviKvsSpecialCommandParsingRoutine * r)
-		{ m_pSpecialCommandParsingRoutineDict->tqreplace(szCmdName,r); };
+		{ m_pSpecialCommandParsingRoutineDict->replace(szCmdName,r); };
 	KviKvsSpecialCommandParsingRoutine * findSpecialCommandParsingRoutine(const TQString &szCmdName)
-		{ return m_pSpecialCommandParsingRoutineDict->tqfind(szCmdName); };
+		{ return m_pSpecialCommandParsingRoutineDict->find(szCmdName); };
 
 	void registerCoreSimpleCommandExecRoutine(const TQString &szCmdName,KviKvsCoreSimpleCommandExecRoutine * r)
-		{ m_pCoreSimpleCommandExecRoutineDict->tqreplace(szCmdName,r); };
+		{ m_pCoreSimpleCommandExecRoutineDict->replace(szCmdName,r); };
 	KviKvsCoreSimpleCommandExecRoutine * findCoreSimpleCommandExecRoutine(const TQString &szCmdName)
-		{ return m_pCoreSimpleCommandExecRoutineDict->tqfind(szCmdName); };
+		{ return m_pCoreSimpleCommandExecRoutineDict->find(szCmdName); };
 
 	void registerCoreFunctionExecRoutine(const TQString &szFncName,KviKvsCoreFunctionExecRoutine * r)
-		{ m_pCoreFunctionExecRoutineDict->tqreplace(szFncName,r); };
+		{ m_pCoreFunctionExecRoutineDict->replace(szFncName,r); };
 	KviKvsCoreFunctionExecRoutine * findCoreFunctionExecRoutine(const TQString &szFncName)
-		{ return m_pCoreFunctionExecRoutineDict->tqfind(szFncName); };
+		{ return m_pCoreFunctionExecRoutineDict->find(szFncName); };
 
 	void registerCoreCallbackCommandExecRoutine(const TQString &szCmdName,KviKvsCoreCallbackCommandExecRoutine * r)
-		{ m_pCoreCallbackCommandExecRoutineDict->tqreplace(szCmdName,r); };
+		{ m_pCoreCallbackCommandExecRoutineDict->replace(szCmdName,r); };
 	KviKvsCoreCallbackCommandExecRoutine * findCoreCallbackCommandExecRoutine(const TQString &szCmdName)
-		{ return m_pCoreCallbackCommandExecRoutineDict->tqfind(szCmdName); };
+		{ return m_pCoreCallbackCommandExecRoutineDict->find(szCmdName); };
 
 	void completeCommand(const TQString &szCommandBegin,KviPointerList<TQString> * pMatches);
 	void completeFunction(const TQString &szFunctionBegin,KviPointerList<TQString> * pMatches);
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
index c678cef7..47cdebd3 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
@@ -90,17 +90,17 @@ void KviKvsModuleInterface::completeFunction(const TQString &szFunctionBegin,Kvi
 
 void KviKvsModuleInterface::kvsRegisterSimpleCommand(const TQString &szCommand,KviKvsModuleSimpleCommandExecRoutine r)
 {
-	m_pModuleSimpleCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r));
+	m_pModuleSimpleCommandExecRoutineDict->replace(szCommand,new KviKvsModuleSimpleCommandExecRoutine(r));
 }
 
 void KviKvsModuleInterface::kvsRegisterCallbackCommand(const TQString &szCommand,KviKvsModuleCallbackCommandExecRoutine r)
 {
-	m_pModuleCallbackCommandExecRoutineDict->tqreplace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r));
+	m_pModuleCallbackCommandExecRoutineDict->replace(szCommand,new KviKvsModuleCallbackCommandExecRoutine(r));
 }
 
 void KviKvsModuleInterface::kvsRegisterFunction(const TQString &szFunction,KviKvsModuleFunctionExecRoutine r)
 {
-	m_pModuleFunctionExecRoutineDict->tqreplace(szFunction,new KviKvsModuleFunctionExecRoutine(r));
+	m_pModuleFunctionExecRoutineDict->replace(szFunction,new KviKvsModuleFunctionExecRoutine(r));
 }
 
 
@@ -161,7 +161,7 @@ static bool default_module_kvs_cmd_unload(KviKvsModuleCommandCall *c)
 {
 	if(c->module()->isLocked())
 	{
-		if(!c->switches()->tqfind('f',"force"))
+		if(!c->switches()->find('f',"force"))
 		{
 			c->warning(__tr2qs("Can't unload the module: it has locked itself in memory"));
 			return true;
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.h b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
index 698c393d..0b47154b 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.h
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.h
@@ -79,8 +79,8 @@ public:
 	KviKvsSwitchList * switchList(){ return m_pSwitchList; };
 	
 	// forwarders for the switch list
-	bool hasSwitch(unsigned short u,const TQString &szSwitch){ return (m_pSwitchList->tqfind(u,szSwitch) != 0); };
-	KviKvsVariant * getSwitch(unsigned short u,const TQString &szSwitch){ return m_pSwitchList->tqfind(u,szSwitch); };
+	bool hasSwitch(unsigned short u,const TQString &szSwitch){ return (m_pSwitchList->find(u,szSwitch) != 0); };
+	KviKvsVariant * getSwitch(unsigned short u,const TQString &szSwitch){ return m_pSwitchList->find(u,szSwitch); };
 };
 
 class KVIRC_API KviKvsModuleCallbackCommandCall : public KviKvsModuleCommandCall
@@ -167,11 +167,11 @@ public:
 	void kvsUnregisterAllEventHandlers();
 
 	KviKvsModuleSimpleCommandExecRoutine * kvsFindSimpleCommand(const TQString &szCommand)
-		{ return m_pModuleSimpleCommandExecRoutineDict->tqfind(szCommand); };
+		{ return m_pModuleSimpleCommandExecRoutineDict->find(szCommand); };
 	KviKvsModuleCallbackCommandExecRoutine * kvsFindCallbackCommand(const TQString &szCommand)
-		{ return m_pModuleCallbackCommandExecRoutineDict->tqfind(szCommand); };
+		{ return m_pModuleCallbackCommandExecRoutineDict->find(szCommand); };
 	KviKvsModuleFunctionExecRoutine * kvsFindFunction(const TQString &szFunction)
-		{ return m_pModuleFunctionExecRoutineDict->tqfind(szFunction); };
+		{ return m_pModuleFunctionExecRoutineDict->find(szFunction); };
 
 	void completeCommand(const TQString &cmd,KviPointerList<TQString> * matches);
 	void completeFunction(const TQString &cmd,KviPointerList<TQString> * matches);
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 572ea1ac..c6d9fcb9 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -742,7 +742,7 @@ bool KviKvsObject::connectSignal(const TQString &sigName,KviKvsObject * pTarget,
 		m_pSignalDict->setAutoDelete(true);
 	}
 
-	KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName);
+	KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName);
 	if(!l)
 	{
 		l = new KviKvsObjectConnectionList;
@@ -776,7 +776,7 @@ bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObject * pTarg
 {
 	if(!m_pSignalDict)return false; //no such signal to disconnect
 
-	KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName);
+	KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName);
 	if(!l)return false;
 
 	KviKvsObjectConnectionListIterator it(*l);
@@ -806,11 +806,11 @@ bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObject * pTarg
 bool KviKvsObject::disconnectSignal(const TQString &sigName,KviKvsObjectConnection * pConnection)
 {
 	if(!m_pSignalDict)return false;
-	KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName);
+	KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName);
 	//__range_valid(l);
 	if(!l)return false;
 	pConnection->pTargetObject->unregisterConnection(pConnection);
-	//__range_valid(l->tqfindRef(pConnection) > -1);
+	//__range_valid(l->findRef(pConnection) > -1);
 	l->removeRef(pConnection);
 	if(l->isEmpty())m_pSignalDict->remove(sigName);
 	if(m_pSignalDict->isEmpty())
@@ -838,7 +838,7 @@ int KviKvsObject::emitSignal(const TQString &sigName,KviKvsObjectFunctionCall *
 {
 	if(!m_pSignalDict)return 0;
 
-	KviKvsObjectConnectionList * l = m_pSignalDict->tqfind(sigName);
+	KviKvsObjectConnectionList * l = m_pSignalDict->find(sigName);
 	if(!l)return 0; // no slots registered
 
 	KviKvsVariant retVal;
@@ -1156,7 +1156,7 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c)
 #ifdef COMPILE_USE_QT4
 	int idx = m_pObject->tqmetaObject()->indexOfProperty(szName);
 #else
-	int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true);
+	int idx = m_pObject->tqmetaObject()->findProperty(szName,true);
 #endif
 	if(idx < 0)
 	{
@@ -1305,12 +1305,12 @@ bool KviKvsObject::function_setProperty(KviKvsObjectFunctionCall * c)
 			TQFont fnt;
 			fnt.setFamily(szFf);
 			fnt.setPointSize(iPs);
-			if(szFl.tqfind('b') != -1)fnt.setBold(true);
-			if(szFl.tqfind('i') != -1)fnt.setItalic(true);
-			if(szFl.tqfind('u') != -1)fnt.setUnderline(true);
-			if(szFl.tqfind('o') != -1)fnt.setOverline(true);
-			if(szFl.tqfind('f') != -1)fnt.setFixedPitch(true);
-			if(szFl.tqfind('s') != -1)fnt.setStrikeOut(true);
+			if(szFl.find('b') != -1)fnt.setBold(true);
+			if(szFl.find('i') != -1)fnt.setItalic(true);
+			if(szFl.find('u') != -1)fnt.setUnderline(true);
+			if(szFl.find('o') != -1)fnt.setOverline(true);
+			if(szFl.find('f') != -1)fnt.setFixedPitch(true);
+			if(szFl.find('s') != -1)fnt.setStrikeOut(true);
 			m_pObject->setProperty(szName,TQVariant(fnt));
 		}
 		break;
@@ -1387,7 +1387,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c)
 #ifdef COMPILE_USE_QT4
 	int idx = m_pObject->tqmetaObject()->indexOfProperty(szName);
 #else
-	int idx = m_pObject->tqmetaObject()->tqfindProperty(szName,true);
+	int idx = m_pObject->tqmetaObject()->findProperty(szName,true);
 #endif
 	if(idx < 0)
 	{
@@ -1564,7 +1564,7 @@ KviKvsObjectFunctionHandler * KviKvsObject::lookupFunctionHandler(const TQString
 	if(classOverride.isEmpty() && m_pFunctionHandlers)
 	{
 		// lookup the local overrides
-		h = m_pFunctionHandlers->tqfind(funcName);
+		h = m_pFunctionHandlers->find(funcName);
 	}
 
 	if(!h)
@@ -1711,7 +1711,7 @@ void KviKvsObject::registerPrivateImplementation(const TQString &szFunctionName,
 		szContext += "[privateimpl]::";
 		szContext += szFunctionName;
 
-		m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode));
+		m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szCode));
 	}
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp
index 7a01532b..f9952388 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp
@@ -91,7 +91,7 @@ KviKvsObjectClass::~KviKvsObjectClass()
 
 void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,KviKvsObjectFunctionHandlerProc pProc,unsigned int uFlags)
 {
-	m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags));
+	m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectCoreCallFunctionHandler(pProc,uFlags));
 }
 
 void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,const TQString &szBuffer,unsigned int uFlags)
@@ -99,22 +99,22 @@ void KviKvsObjectClass::registerFunctionHandler(const TQString & szFunctionName,
 	TQString szContext = m_szName;
 	szContext += "::";
 	szContext += szFunctionName;
-	m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags));
+	m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectScriptFunctionHandler(szContext,szBuffer,uFlags));
 }
 
 void KviKvsObjectClass::registerStandardNothingReturnFunctionHandler(const TQString &szFunctionName)
 {
-	m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler());
+	m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardNothingReturnFunctionHandler());
 }
 
 void KviKvsObjectClass::registerStandardTrueReturnFunctionHandler(const TQString &szFunctionName)
 {
-	m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler());
+	m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardTrueReturnFunctionHandler());
 }
 
 void KviKvsObjectClass::registerStandardFalseReturnFunctionHandler(const TQString &szFunctionName)
 {
-	m_pFunctionHandlers->tqreplace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler());
+	m_pFunctionHandlers->replace(szFunctionName,new KviKvsObjectStandardFalseReturnFunctionHandler());
 }
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.h b/src/kvirc/kvs/kvi_kvs_object_class.h
index 646b6163..5815743e 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.h
+++ b/src/kvirc/kvs/kvi_kvs_object_class.h
@@ -88,7 +88,7 @@ public:
 	// retisters an empty handler that returns $false
 	void registerStandardFalseReturnFunctionHandler(const TQString & szFunc);
 
-	KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & szFunc){ return m_pFunctionHandlers->tqfind(szFunc); };
+	KviKvsObjectFunctionHandler * lookupFunctionHandler(const TQString & szFunc){ return m_pFunctionHandlers->find(szFunc); };
 	KviKvsObject * allocateInstance(KviKvsObject * pParent,const TQString &szName,KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams);
 
 	bool save(const TQString &szFileName);
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 583641ee..3ec6ea73 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -166,7 +166,7 @@ void KviKvsObjectController::flushUserClasses()
 				TQString szPath;
 				TQString szFileName = c->name().lower();
 				szFileName += ".kvs";
-				szFileName.tqreplace("::","--");
+				szFileName.replace("::","--");
 				g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
 				if(c->save(szPath))
 					c->clearDirtyFlag();
@@ -180,7 +180,7 @@ void KviKvsObjectController::flushUserClasses()
 
 KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass,bool bBuiltinOnly)
 {
-	KviKvsObjectClass * pC = m_pClassDict->tqfind(szClass);
+	KviKvsObjectClass * pC = m_pClassDict->find(szClass);
 	if(!pC)
 	{
 		// maybe we need to load the object library ?
@@ -189,7 +189,7 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass,
 		{
 			debug("ops...something wrong with the libkviobjects module!");
 			return 0;
-		} else pC = m_pClassDict->tqfind(szClass);
+		} else pC = m_pClassDict->find(szClass);
 		if(!pC)
 		{
 			if(bBuiltinOnly)return 0;
@@ -197,13 +197,13 @@ KviKvsObjectClass * KviKvsObjectController::lookupClass(const TQString &szClass,
 			TQString szPath;
 			TQString szFileName = szClass.lower();
 			szFileName += ".kvs";
-			szFileName.tqreplace("::","--");
+			szFileName.replace("::","--");
 			g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
 			if(!KviFileUtils::fileExists(szPath))
 				g_pApp->getGlobalKvircDirectory(szPath,KviApp::Classes,szFileName);
 			if(!KviFileUtils::fileExists(szPath))return 0;
 			if(!KviKvsObjectClass::load(szPath))return 0;
-			pC = m_pClassDict->tqfind(szClass);
+			pC = m_pClassDict->find(szClass);
 			if(pC)pC->clearDirtyFlag(); // just loaded from disk: no need to sync it
 		}
 	} else {
@@ -221,7 +221,7 @@ void KviKvsObjectController::deleteClass(KviKvsObjectClass * pClass)
 	TQString szPath;
 	TQString szFileName = pClass->name().lower();
 	szFileName += ".kvs";
-	szFileName.tqreplace("::","--");
+	szFileName.replace("::","--");
 	g_pApp->getLocalKvircDirectory(szPath,KviApp::Classes,szFileName);
 	KviFileUtils::removeFile(szPath);
 	delete pClass;
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.h b/src/kvirc/kvs/kvi_kvs_object_controller.h
index 28b9ae5f..870131e3 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.h
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.h
@@ -62,7 +62,7 @@ public:
 	void flushUserClasses();
 	void killAllObjectsWithClass(KviKvsObjectClass * pClass);
 	KviKvsObjectClass * lookupClass(const TQString &szClass,bool bBuiltinOnly = false);
-	KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->tqfind(hObject); };
+	KviKvsObject * lookupObject(kvs_hobject_t hObject){ return m_pObjectDict->find(hObject); };
 	KviPointerHashTable<void *,KviKvsObject> * objectDict(){ return m_pObjectDict; };
 	KviPointerHashTable<TQString,KviKvsObjectClass> * classDict(){ return m_pClassDict; };
 };
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index 24f3ac9a..fc483f51 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -2675,7 +2675,7 @@ KviKvsTreeNodeVariable * KviKvsParser::parsePercent(bool bInObjScope)
 	
 	if(m_pGlobals)
 	{
-		if(m_pGlobals->tqfind(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier);
+		if(m_pGlobals->find(szIdentifier))return new KviKvsTreeNodeGlobalVariable(pBegin,szIdentifier);
 	}
 
 	if(m_iFlags & AssumeLocals)
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
index bfb0bd52..3733f55f 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
@@ -229,12 +229,12 @@
 		[example]
 		%var << Pragma
 		[/example]
-		%var now tqcontains "Ciao ciao Pragma"[br]
+		%var now contains "Ciao ciao Pragma"[br]
 		Append a '!' character
 		[example]
 		%var <+ !
 		[/example]
-		%var now tqcontains "Ciao ciao Pragma!"
+		%var now contains "Ciao ciao Pragma!"
 		Now reset it.
 		[example]
 		%var =
@@ -245,7 +245,7 @@
 		%var = Pragma,Diabl0,Arter|o	
 		%var <, MalboroLi
 		[/example]
-		%var now tqcontains "Pragma,Diabl0,Arter|o,MalboroLi"[br]
+		%var now contains "Pragma,Diabl0,Arter|o,MalboroLi"[br]
 		[br]
 		Now a longer example.
 		[example]
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index 4cf0cbc7..6f78ad16 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -263,7 +263,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseSpecialCommandGlobal()
 			m_pGlobals = new KviPointerHashTable<TQString,TQString>(17,false);
 			m_pGlobals->setAutoDelete(true);
 		}
-		m_pGlobals->tqreplace(szIdentifier,new TQString());
+		m_pGlobals->replace(szIdentifier,new TQString());
 		
 		skipSpaces();
 		
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.h b/src/kvirc/kvs/kvi_kvs_popupmanager.h
index 2b7a52ec..87b992f2 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmanager.h
@@ -43,9 +43,9 @@ public:
 
 	KviPointerHashTable<TQString,KviKvsPopupMenu> * popupDict(){ return m_pPopupDict; };
 
-	KviKvsPopupMenu * lookup(const TQString &szPopupName){ return m_pPopupDict->tqfind(szPopupName); };
+	KviKvsPopupMenu * lookup(const TQString &szPopupName){ return m_pPopupDict->find(szPopupName); };
 	KviKvsPopupMenu * get(const TQString &szPopupName);
-	void add(const TQString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->tqreplace(szPopupName,pPopup); };
+	void add(const TQString &szPopupName,KviKvsPopupMenu * pPopup){ m_pPopupDict->replace(szPopupName,pPopup); };
 	void remove(const TQString &szPopupName){ m_pPopupDict->remove(szPopupName); };
 	void clear(){ m_pPopupDict->clear(); };
 
diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp
index 99535918..aa40ef37 100644
--- a/src/kvirc/kvs/kvi_kvs_report.cpp
+++ b/src/kvirc/kvs/kvi_kvs_report.cpp
@@ -124,7 +124,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP
 		TQString * pListingStr = new TQString();
 		KviTQString::sprintf(*pListingStr,"%d ",iLine - 1);
 		*pListingStr += TQString(pPrevLine,pLineBegin - pPrevLine);
-		pListingStr->tqreplace("\n","");
+		pListingStr->replace("\n","");
 		pListing->append(pListingStr);
 	}
 	
@@ -143,7 +143,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP
 		TQString * pListingStr = new TQString();
 		KviTQString::sprintf(*pListingStr,"%c%d ",KVI_TEXT_BOLD,iLine);
 		*pListingStr += TQString(pLineBegin,pBegin - pLineBegin);
-		pListingStr->tqreplace("\n","");
+		pListingStr->replace("\n","");
 		pListing->append(pListingStr);
 	}
 
@@ -164,7 +164,7 @@ void KviKvsReport::findLineColAndListing(const TQChar * pBegin,const TQChar * pP
 			TQString * pListingStr = new TQString();
 			KviTQString::sprintf(*pListingStr,"%d ",iLine + 1);
 			*pListingStr += TQString(pLineBegin,pBegin - pLineBegin);
-			pListingStr->tqreplace("\n","");
+			pListingStr->replace("\n","");
 			pListing->append(pListingStr);
 		}
 	
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
index 23f6ade3..afcd97da 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
@@ -324,7 +324,7 @@ void KviKvsScriptAddonManager::delayedLoad()
 		TQString szName = it.currentKey();
 		KviKvsScriptAddon * a = new KviKvsScriptAddon();
 		if(a->load(&cfg,szName))
-			m_pAddonDict->tqreplace(szName,a);
+			m_pAddonDict->replace(szName,a);
 		else
 			delete a;
 		++it;
@@ -351,14 +351,14 @@ bool KviKvsScriptAddonManager::registerAddon(KviKvsScriptAddonRegistrationData *
 			d->szDescriptionScript,
 			d->szUninstallCallbackScript,
 			d->szIconId);
-	m_pAddonDict->tqreplace(d->szName,a);
+	m_pAddonDict->replace(d->szName,a);
 	return true;
 }
 
 KviKvsScriptAddon * KviKvsScriptAddonManager::findAddon(const TQString &szName)
 {
 	if(!m_bLoaded)delayedLoad();
-	return m_pAddonDict->tqfind(szName);
+	return m_pAddonDict->find(szName);
 }
 
 bool KviKvsScriptAddonManager::unregisterAddon(const TQString &szName,KviWindow * pWnd,bool bExecuteUninstallCallback)
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
index 7c56c853..7a47a913 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
@@ -60,7 +60,7 @@ void KviKvsSwitchList::addShort(unsigned short uShortKey,KviKvsVariant * pVarian
 		m_pShortSwitchDict = new KviPointerHashTable<unsigned short,KviKvsVariant>(11);
 		m_pShortSwitchDict->setAutoDelete(true);
 	}
-	m_pShortSwitchDict->tqreplace(uShortKey,pVariant);
+	m_pShortSwitchDict->replace(uShortKey,pVariant);
 }
 
 void KviKvsSwitchList::addLong(const TQString &szLongKey,KviKvsVariant * pVariant)
@@ -70,6 +70,6 @@ void KviKvsSwitchList::addLong(const TQString &szLongKey,KviKvsVariant * pVarian
 		m_pLongSwitchDict = new KviPointerHashTable<TQString,KviKvsVariant>(11);
 		m_pLongSwitchDict->setAutoDelete(true);
 	}
-	m_pLongSwitchDict->tqreplace(szLongKey,pVariant);
+	m_pLongSwitchDict->replace(szLongKey,pVariant);
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h
index b660569a..b82d93f8 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.h
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.h
@@ -46,35 +46,35 @@ public:
 
 	bool isEmpty(){ return ((m_pShortSwitchDict == 0) && (m_pLongSwitchDict == 0)); };
 
-	KviKvsVariant * tqfind(const TQChar &c)
+	KviKvsVariant * find(const TQChar &c)
 	{
-		return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind(c.tqunicode()) : 0;
+		return m_pShortSwitchDict ? m_pShortSwitchDict->find(c.tqunicode()) : 0;
 	};
 
-	KviKvsVariant * tqfind(unsigned short uShortKey)
+	KviKvsVariant * find(unsigned short uShortKey)
 	{
-		return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0;
+		return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0;
 	};
 	
-	KviKvsVariant * tqfind(const TQString &szLongKey)
+	KviKvsVariant * find(const TQString &szLongKey)
 	{
-		return m_pLongSwitchDict ? m_pLongSwitchDict->tqfind(szLongKey) : 0;
+		return m_pLongSwitchDict ? m_pLongSwitchDict->find(szLongKey) : 0;
 	};
 
-	KviKvsVariant * tqfind(unsigned short uShortKey,const TQString &szLongKey)
+	KviKvsVariant * find(unsigned short uShortKey,const TQString &szLongKey)
 	{
 		if(m_pLongSwitchDict)
 		{
 			KviKvsVariant * t;
-			t = m_pLongSwitchDict->tqfind(szLongKey);
+			t = m_pLongSwitchDict->find(szLongKey);
 			if(t)return t;
 		}
-		return m_pShortSwitchDict ? m_pShortSwitchDict->tqfind((int)uShortKey) : 0;
+		return m_pShortSwitchDict ? m_pShortSwitchDict->find((int)uShortKey) : 0;
 	};
 	
 	bool getAsStringIfExisting(unsigned short uShortKey,const TQString &szLongKey,TQString &szBuffer)
 	{
-		KviKvsVariant * v = tqfind(uShortKey,szLongKey);
+		KviKvsVariant * v = find(uShortKey,szLongKey);
 		if(v)
 		{
 			v->asString(szBuffer);
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
index 3bd4301e..ca21598d 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
@@ -122,7 +122,7 @@ bool KviKvsTimerManager::addTimer(const TQString &szName,KviKvsTimer::Lifetime l
 	}
 
 	KviKvsTimer * t = new KviKvsTimer(szName,l,pWnd,iDelay,iId,pCallback,pParams);
-	KviKvsTimer * old = m_pTimerDictByName->tqfind(szName);
+	KviKvsTimer * old = m_pTimerDictByName->find(szName);
 	if(old)deleteTimer(old->id());
 	m_pTimerDictByName->insert(szName,t);
 	m_pTimerDictById->insert(t->id(),t);
@@ -131,7 +131,7 @@ bool KviKvsTimerManager::addTimer(const TQString &szName,KviKvsTimer::Lifetime l
 
 bool KviKvsTimerManager::deleteTimer(const TQString &szName)
 {
-	KviKvsTimer * t = m_pTimerDictByName->tqfind(szName);
+	KviKvsTimer * t = m_pTimerDictByName->find(szName);
 	if(!t)return false;
 	killTimer(t->id());
 	m_pTimerDictById->remove(t->id());
@@ -142,7 +142,7 @@ bool KviKvsTimerManager::deleteTimer(const TQString &szName)
 
 bool KviKvsTimerManager::deleteTimer(int iId)
 {
-	KviKvsTimer * t = m_pTimerDictById->tqfind(iId);
+	KviKvsTimer * t = m_pTimerDictById->find(iId);
 	if(!t)return false;
 	killTimer(t->id());
 	m_pTimerDictById->remove(t->id());
@@ -206,7 +206,7 @@ void KviKvsTimerManager::timerEvent(TQTimerEvent *e)
 		return;
 	}
 
-	KviKvsTimer * t = m_pTimerDictById->tqfind(iId);
+	KviKvsTimer * t = m_pTimerDictById->find(iId);
 	if(!t)
 	{
 		debug("Internal error: got an nonexistant timer event");
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.h b/src/kvirc/kvs/kvi_kvs_timermanager.h
index e3161183..83b73d1a 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.h
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.h
@@ -112,7 +112,7 @@ public:
 	// the current timer will be unique
 	bool deleteCurrentTimer();
 	void deleteAllTimers();
-	bool timerExists(const TQString &szName){ return m_pTimerDictByName->tqfind(szName); };
+	bool timerExists(const TQString &szName){ return m_pTimerDictByName->find(szName); };
 	KviPointerHashTable<TQString,KviKvsTimer> * timerDict()
 		{ return m_pTimerDictByName; };
 protected:
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
index 74f58298..74a5e84d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
@@ -57,7 +57,7 @@ bool KviKvsTreeNodeExtendedScopeVariable::evaluateReadOnly(KviKvsRunTimeContext
 		return false;
 	}
 
-	KviKvsVariant * v = c->extendedScopeVariables()->tqfind(m_szIdentifier);
+	KviKvsVariant * v = c->extendedScopeVariables()->find(m_szIdentifier);
 	if(v)
 	{
 		pBuffer->copyFrom(v);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
index a74ebc0d..c78691d4 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
@@ -51,7 +51,7 @@ void KviKvsTreeNodeGlobalVariable::dump(const char * prefix)
 
 bool KviKvsTreeNodeGlobalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
 {
-	KviKvsVariant * v = c->globalVariables()->tqfind(m_szIdentifier);
+	KviKvsVariant * v = c->globalVariables()->find(m_szIdentifier);
 	if(v)pBuffer->copyFrom(v);
 	else pBuffer->setNothing();
 	return true;
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
index 196b992b..59c8e85f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
@@ -102,7 +102,7 @@ bool KviKvsTreeNodeHashElement::evaluateReadOnlyInObjectScope(KviKvsObject *o,Kv
 		return true;
 	}
 
-	KviKvsVariant * v = val.hash()->tqfind(szKey);
+	KviKvsVariant * v = val.hash()->find(szKey);
 	if(!v)
 	{
 		pBuffer->setNothing();
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
index f98dfb4e..54872d50 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
@@ -55,7 +55,7 @@ void KviKvsTreeNodeLocalVariable::dump(const char * prefix)
 bool KviKvsTreeNodeLocalVariable::evaluateReadOnly(KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
 {
 #ifdef COMPILE_NEW_KVS
-	KviKvsVariant * v = c->localVariables()->tqfind(m_szIdentifier);
+	KviKvsVariant * v = c->localVariables()->find(m_szIdentifier);
 	if(v)
 	{
 		pBuffer->copyFrom(v);
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
index f0e49578..f407e2c1 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
@@ -62,7 +62,7 @@ bool KviKvsTreeNodeObjectField::canEvaluateInObjectScope()
 bool KviKvsTreeNodeObjectField::evaluateReadOnlyInObjectScope(KviKvsObject * o,KviKvsRunTimeContext * c,KviKvsVariant * pBuffer)
 {
 #ifdef COMPILE_NEW_KVS
-	KviKvsVariant * v = o->dataContainer()->tqfind(m_szIdentifier);
+	KviKvsVariant * v = o->dataContainer()->find(m_szIdentifier);
 	if(v)pBuffer->copyFrom(v);
 	else pBuffer->setNothing();
 #endif
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
index e8c50b97..26b05b9d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
@@ -1443,10 +1443,10 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c
 	TQString str;
 	target->result()->asString(str);
 
-	bool bGlobal = szF.tqfind('g',false) != -1;
+	bool bGlobal = szF.find('g',false) != -1;
 
-	TQRegExp re(szL,szF.tqfind('i',false) == -1,szF.tqfind('w',false) != -1);
-	re.setMinimal(szF.tqfind('m',false) != -1); // greedy or minimal ?
+	TQRegExp re(szL,szF.find('i',false) == -1,szF.find('w',false) != -1);
+	re.setMinimal(szF.find('m',false) != -1); // greedy or minimal ?
 
 	int idx = 0;
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
index 7462130f..e5647bf0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
@@ -410,7 +410,7 @@ bool KviKvsTreeNodeSpecialCommandDefpopup::execute(KviKvsRunTimeContext * c)
 		}
 		// we want to (re)create it
 
-		if(!swl.tqfind('m',"--merge"))pPopup->doClear();
+		if(!swl.find('m',"--merge"))pPopup->doClear();
 	}
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
index 90e0d1c7..94f9dc21 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
@@ -84,7 +84,7 @@ bool KviKvsTreeNodeSpecialCommandForeach::execute(KviKvsRunTimeContext * c)
 		if(!(m_pSwitches->evaluate(c,&swl)))return false;
 	}
 
-	bool bIncludeEmptyScalars = swl.tqfind('a',"all") != 0;
+	bool bIncludeEmptyScalars = swl.find('a',"all") != 0;
 
 	for(KviKvsVariant * pArg = l.first();pArg;pArg = l.next())
 	{
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
index 32018c2a..305483de 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
@@ -86,7 +86,7 @@ void KviKvsTreeNodeSwitchList::addShort(int iShortKey,KviKvsTreeNodeData * p)
 		m_pShortSwitchDict->setAutoDelete(true);
 	}
 
-	m_pShortSwitchDict->tqreplace(iShortKey,p);
+	m_pShortSwitchDict->replace(iShortKey,p);
 	p->setParent(this);
 }
 
@@ -98,7 +98,7 @@ void KviKvsTreeNodeSwitchList::addLong(const TQString &szLongKey,KviKvsTreeNodeD
 		m_pLongSwitchDict->setAutoDelete(true);
 	}
 
-	m_pLongSwitchDict->tqreplace(szLongKey,p);
+	m_pLongSwitchDict->replace(szLongKey,p);
 	p->setParent(this);
 }
 
@@ -145,7 +145,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch()
 	KviKvsTreeNodeData * d;
 	if(m_pShortSwitchDict)
 	{
-		d = m_pShortSwitchDict->tqfind('r');
+		d = m_pShortSwitchDict->find('r');
 		if(d)
 		{
 			m_pShortSwitchDict->setAutoDelete(false);
@@ -156,7 +156,7 @@ KviKvsTreeNodeData * KviKvsTreeNodeSwitchList::getStandardRebindingSwitch()
 	}
 	if(m_pLongSwitchDict)
 	{
-		d = m_pLongSwitchDict->tqfind("rebind");
+		d = m_pLongSwitchDict->find("rebind");
 		if(d)
 		{
 			m_pLongSwitchDict->setAutoDelete(false);
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp
index 01ad59ec..9a77d51d 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.cpp
+++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp
@@ -148,23 +148,23 @@ void KviKvsUserAction::exportToKvs(TQString &szBuffer,
 	szBuffer += szName;
 	szBuffer += "\",";
 	TQString tmp = szVisibleName;
-	if(tmp.tqcontains('$'))
+	if(tmp.contains('$'))
 	{
 		szBuffer += tmp;
 		szBuffer += ",";
 	} else {
-		tmp.tqreplace("\"","\\\"");
+		tmp.replace("\"","\\\"");
 		szBuffer += "\"";
 		szBuffer += tmp;
 		szBuffer += "\",";
 	}
 	tmp = szDescription;
-	if(tmp.tqcontains('$'))
+	if(tmp.contains('$'))
 	{
 		szBuffer += tmp;
 		szBuffer += ",\"";
 	} else {
-		tmp.tqreplace("\"","\\\"");
+		tmp.replace("\"","\\\"");
 		szBuffer += "\"";
 		szBuffer += tmp;
 		szBuffer += "\",\"";
diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp
index 492bd262..c4e457f8 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.cpp
+++ b/src/kvirc/kvs/kvi_kvs_variant.cpp
@@ -931,14 +931,14 @@ public:
 };
 void KviKvsVariant::serializeString(TQString& buffer)
 {
-	buffer.tqreplace('\\',"\\\\");
-	buffer.tqreplace('\n',"\\n");
-	buffer.tqreplace('\r',"\\r");
-	buffer.tqreplace('\b',"\\b");
-	buffer.tqreplace('\t',"\\t");
-	buffer.tqreplace('\f',"\\f");
-	buffer.tqreplace('/',"\\/");
-	buffer.tqreplace('"',"\\\"");
+	buffer.replace('\\',"\\\\");
+	buffer.replace('\n',"\\n");
+	buffer.replace('\r',"\\r");
+	buffer.replace('\b',"\\b");
+	buffer.replace('\t',"\\t");
+	buffer.replace('\f',"\\f");
+	buffer.replace('/',"\\/");
+	buffer.replace('"',"\\\"");
 	buffer.prepend('"');
 	buffer.append('"');
 }
diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp
index 8716c164..6a4f30f5 100644
--- a/src/kvirc/module/kvi_module.cpp
+++ b/src/kvirc/module/kvi_module.cpp
@@ -266,7 +266,7 @@ unsigned int KviModule::secondsSinceLastAccess()
 /*
 void KviModule::registerCommand(const char * cmd,KviModuleCommandParseProc proc)
 {
-	if(m_pCommandDict->tqfind(cmd))m_pCommandDict->remove(cmd);
+	if(m_pCommandDict->find(cmd))m_pCommandDict->remove(cmd);
 	m_pCommandDict->insert(cmd,new KviModuleCommandParseProc(proc));
 }
 
@@ -312,7 +312,7 @@ void KviModule::unregisterAllEventHandlers()
 
 void KviModule::registerFunction(const char * fnc,KviModuleFunctionParseProc proc)
 {
-	if(m_pFunctionDict->tqfind(fnc))m_pFunctionDict->remove(fnc);
+	if(m_pFunctionDict->find(fnc))m_pFunctionDict->remove(fnc);
 	m_pFunctionDict->insert(fnc,new KviModuleFunctionParseProc(proc));
 }
 
diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp
index 5e82f634..7b182643 100644
--- a/src/kvirc/module/kvi_moduleextension.cpp
+++ b/src/kvirc/module/kvi_moduleextension.cpp
@@ -103,13 +103,13 @@ KviModuleExtensionManager::~KviModuleExtensionManager()
 KviModuleExtensionDescriptorList * KviModuleExtensionManager::getExtensionList(const KviStr &szType)
 {
 	g_pModuleManager->loadModulesByCaps(szType.ptr());
-	return m_pExtensionDict->tqfind(szType.ptr());
+	return m_pExtensionDict->find(szType.ptr());
 }
 
 KviModuleExtensionDescriptor * KviModuleExtensionManager::registerExtension(KviModule * m,const KviStr &szType,const KviStr &szName,const TQString &szVisibleName,KviModuleExtensionAllocRoutine r,const TQPixmap &icon)
 {
 	KviModuleExtensionDescriptor * d = new KviModuleExtensionDescriptor(m,szType,szName,szVisibleName,r,icon);
-	KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr());
+	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
 	if(!l)
 	{
 		l = new KviModuleExtensionDescriptorList();
@@ -157,12 +157,12 @@ KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionG
 		(void)m; // get rid of the unused warning :D
 	}
 
-	KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr());
+	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
 	if(!l)
 	{
 		// retry : it might have been unloaded
 		g_pModuleManager->loadModulesByCaps(szType.ptr());
-		l = m_pExtensionDict->tqfind(szType.ptr());
+		l = m_pExtensionDict->find(szType.ptr());
 	}
 
 	return l;
@@ -170,7 +170,7 @@ KviModuleExtensionDescriptorList * KviModuleExtensionManager::allocateExtensionG
 
 KviModuleExtensionDescriptor * KviModuleExtensionManager::findExtensionDescriptor(const KviStr &szType,const KviStr &szName)
 {
-	KviModuleExtensionDescriptorList * l = m_pExtensionDict->tqfind(szType.ptr());
+	KviModuleExtensionDescriptorList * l = m_pExtensionDict->find(szType.ptr());
 	if(!l)return 0;
 
 	for(KviModuleExtensionDescriptor * d = l->first();d;d = l->next())
@@ -196,7 +196,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &
 	// uhm... not there ?
 	g_pModuleManager->loadModulesByCaps(szType.ptr());
 	// try again after loading the modules
-	// l = m_pExtensionDict->tqfind(szType.ptr()); <--- this shouldn't change!
+	// l = m_pExtensionDict->find(szType.ptr()); <--- this shouldn't change!
 	for(d = l->first();d;d = l->next())
 	{
 		if(d->name().equalsCI(szName))return d->allocate(pWnd,pParams,pSpecial);
@@ -222,7 +222,7 @@ KviModuleExtension * KviModuleExtensionManager::allocateExtension(const KviStr &
 	// uhm... not there ?
 	g_pModuleManager->loadModulesByCaps(szType.ptr());
 	// try again after loading the modules
-	// l = m_pExtensionDict->tqfind(szType.ptr()); <--- this shouldn't change!
+	// l = m_pExtensionDict->find(szType.ptr()); <--- this shouldn't change!
 	for(d = l->first();d;d = l->next())
 	{
 		if(d->id() == id)return d->allocate(pWnd,pParams,pSpecial);
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp
index 4df7de19..7adeb9cd 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/kvi_modulemanager.cpp
@@ -124,18 +124,18 @@ void KviModuleManager::completeModuleNames(const TQString &word,KviPointerList<T
 
 KviModule * KviModuleManager::findModule(const char * modName)
 {
-	KviModule * m = m_pModuleDict->tqfind(modName);
+	KviModule * m = m_pModuleDict->find(modName);
 	if(m)m->updateAccessTime();
 	return m;
 }
 
 KviModule * KviModuleManager::getModule(const char * modName)
 {
-	KviModule * m = m_pModuleDict->tqfind(modName);
+	KviModule * m = m_pModuleDict->find(modName);
 	if(!m)
 	{
 		if(!loadModule(modName)) return 0;
-		m = m_pModuleDict->tqfind(modName);
+		m = m_pModuleDict->find(modName);
 	}
 	if(m)m->updateAccessTime();
 	return m;
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index fdf9dc17..10c5ac1c 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1098,7 +1098,7 @@ void KviServerParser::parseCtcpReplyPing(KviCtcpMessage * msg)
 
 		bool bOk;
 
-		if(szTime.tqcontains('.'))
+		if(szTime.contains('.'))
 		{
 			KviStr szUSecs = szTime;
 			szUSecs.cutToFirst('.');
@@ -1511,7 +1511,7 @@ void KviServerParser::parseCtcpRequestAvatar(KviCtcpMessage *msg)
 				TQString szReply,szFileName;
 				szFileName=a->name();
 				if(KVI_OPTION_BOOL(KviOption_boolDCCFileTransferReplaceOutgoingSpacesWithUnderscores))
-					szFileName.tqreplace(" ","_");
+					szFileName.replace(" ","_");
 
 				// escape the spaces with the right octal code
 				encodeCtcpParameter(szFileName,szReply);
@@ -1573,7 +1573,7 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg)
 
 	KviTQString::sprintf(nickLink,"\r!n\r%Q\r",&(msg->pSource->nick()));
 
-	KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->tqfind(msg->pSource->nick());
+	KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->find(msg->pSource->nick());
 	if(e){
 		if( (szGender=="m") || (szGender=="M") ) {
 			e->setGender(KviIrcUserEntry::Male);
@@ -1631,8 +1631,8 @@ void KviServerParser::parseCtcpReplyAvatar(KviCtcpMessage *msg)
 					TQString szCommand = "http.get -w=nm ";
 					unsigned int uMaxSize = KVI_OPTION_UINT(KviOption_uintMaximumRequestedAvatarSize);
 					if(uMaxSize > 0)KviTQString::appendFormatted(szCommand,"-m=%u ",uMaxSize);
-					szRemoteFile = szRemoteFile.tqreplace(";","%3B");
-					szRemoteFile = szRemoteFile.tqreplace("\"","%22");
+					szRemoteFile = szRemoteFile.replace(";","%3B");
+					szRemoteFile = szRemoteFile.replace("\"","%22");
 					szCommand += "\""+szRemoteFile+"\"";
 					szCommand += " \"";
 					szCommand += szLocalFilePath.ptr();
@@ -1800,10 +1800,10 @@ void KviServerParser::parseCtcpReplyUserinfo(KviCtcpMessage *msg)
 	TQString decoded=msg->msg->console()->decodeText(msg->pData);
 	
 	bool bNeedToUpdateUserlist = false;
-	KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->tqfind(msg->pSource->nick());
+	KviIrcUserEntry * e = msg->msg->connection()->userDataBase()->find(msg->pSource->nick());
 	if(e)
 	{
-		int pos = decoded.tqfind("Gender=",0,false);	
+		int pos = decoded.find("Gender=",0,false);	
 		
 		if(pos>=0)
 		{
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index c86523f9..34989dba 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -651,7 +651,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
 				szNick,szUser,szHost,victim,szKickMsg))
 			msg->setHaltOutput();
 
-		KviIrcUserEntry * e = msg->connection()->userDataBase()->tqfind(victim);
+		KviIrcUserEntry * e = msg->connection()->userDataBase()->find(victim);
 
 		TQString szVHost;
 		TQString szVUser;
@@ -1052,7 +1052,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
 	{
 		if(szUser == "*")
 		{
-			if(szNick.tqfind('.') != -1)
+			if(szNick.find('.') != -1)
 			{
 				// server notice
 				// FIXME: "Dedicated window for server notices ?"
@@ -1635,7 +1635,7 @@ void KviServerParser::parseLiteralMode(KviIrcMessage *msg)
 	//	{
 	//		// This is a server or a channel service
 	//		KviStr snick = source.nick();
-	//		if(snick.tqcontains('.'))source.setHost(source.nick()); // this is a server
+	//		if(snick.contains('.'))source.setHost(source.nick()); // this is a server
 	//	}
 
 	TQString szTarget = msg->connection()->decodeText(msg->safeParam(0));
@@ -1682,7 +1682,7 @@ void KviServerParser::parseChannelMode(const TQString &szNick,const TQString &sz
 		KviTQString::sprintf(nickBuffer,"\r!n\r%Q\r",&szNick);
 		KviTQString::sprintf(hostBuffer,"\r!h\r%Q\r",&szHost);
 	} else {
-		if(nickBuffer.tqfind('.') != -1)
+		if(nickBuffer.find('.') != -1)
 		{
 			// This looks a lot like a server!
 			KviTQString::sprintf(nickBuffer,"\r!s\r%Q\r",&szNick);
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 6a6845d8..802cc608 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -61,8 +61,8 @@
 #include "kvi_kvs_variantlist.h"
 
 // #define IS_CHANNEL_TYPE_FLAG(_str) ((*(_str) == '#') || (*(_str) == '&') || (*(_str) == '!'))
-#define IS_CHANNEL_TYPE_FLAG(_qchar) (msg->connection()->serverInfo()->supportedChannelTypes().tqfind(_qchar) != -1)
-#define IS_USER_MODE_PREFIX(_qchar) (msg->connection()->serverInfo()->supportedModePrefixes().tqfind(_qchar) != -1)
+#define IS_CHANNEL_TYPE_FLAG(_qchar) (msg->connection()->serverInfo()->supportedChannelTypes().find(_qchar) != -1)
+#define IS_USER_MODE_PREFIX(_qchar) (msg->connection()->serverInfo()->supportedModePrefixes().find(_qchar) != -1)
 
 // Numeric message handlers
 
@@ -126,7 +126,7 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg)
 	do
 	{
 		umodes      = msg->safeParam(uModeParam);
-	} while (((umodes.tqcontains('.')) || (umodes.tqcontains('-'))) && uModeParam++ < uParams);
+	} while (((umodes.contains('.')) || (umodes.contains('-'))) && uModeParam++ < uParams);
 
 	KviStr chanmodes = msg->safeParam(uModeParam+1);
 
@@ -139,7 +139,7 @@ void KviServerParser::parseNumeric004(KviIrcMessage *msg)
 	if((umodes.occurences('o') != 1) || (chanmodes.occurences('o') != 1) ||
 		(chanmodes.occurences('b') != 1) || (chanmodes.occurences('v') != 1) ||
 		(chanmodes.occurences('t') != 1) || (chanmodes.occurences('n') != 1) ||
-		(chanmodes.tqcontains('.')) || (chanmodes.tqcontains('-')) || (chanmodes.tqcontains('(')))
+		(chanmodes.contains('.')) || (chanmodes.contains('-')) || (chanmodes.contains('(')))
 	{
 		if(!_OUTPUT_TQUIET)
 		{
@@ -303,7 +303,7 @@ void KviServerParser::parseNumeric005(KviIrcMessage *msg)
 					msg->console()->outputNoFmt(KVI_OUT_SERVERINFO,__tr2qs("This server supports the CODEPAGE command, it will be used"));
 				}
 
-				/*if( tmp.tqcontains(msg->console()->textCodec()->name(),false) || tmp.tqcontains("*",false) )
+				/*if( tmp.contains(msg->console()->textCodec()->name(),false) || tmp.contains("*",false) )
 				{
 					msg->connection()->sendFmtData("CODEPAGE %s",msg->console()->textCodec()->name());
 				}*/
@@ -682,7 +682,7 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 	TQString szServ = msg->connection()->decodeText(msg->safeParam(4));
 	TQString szNick = msg->connection()->decodeText(msg->safeParam(5));
 	TQString szFlag = msg->connection()->decodeText(msg->safeParam(6));
-	bool bAway = szFlag.tqfind('G') != -1;
+	bool bAway = szFlag.find('G') != -1;
 
 	KviStr trailing = msg->safeTrailing();
 	KviStr hops = trailing.getToken(' ');
@@ -693,7 +693,7 @@ void KviServerParser::parseNumericWhoReply(KviIrcMessage *msg)
 
 	// Update the user entry
 	KviIrcUserDataBase * db = msg->connection()->userDataBase();
-	KviIrcUserEntry * e = db->tqfind(szNick);
+	KviIrcUserEntry * e = db->find(szNick);
 	if(e)
 	{
 		if(bHopsOk)e->setHops(iHops);
@@ -1023,7 +1023,7 @@ void KviServerParser::parseNumericWhoisAway(KviIrcMessage * msg)
 
 	TQString szNk = msg->connection()->decodeText(msg->safeParam(1));
 	KviIrcUserDataBase * db = msg->connection()->userDataBase();
-	KviIrcUserEntry * e = db->tqfind(szNk);
+	KviIrcUserEntry * e = db->find(szNk);
 	if(e)e->setAway(true);
 	KviQuery * q = msg->connection()->findQuery(szNk);
 	if(q) q->updateLabelText();
@@ -1050,7 +1050,7 @@ void KviServerParser::parseNumericWhoisUser(KviIrcMessage *msg)
 	TQString szHost = msg->connection()->decodeText(msg->safeParam(3));
 	TQString szReal = msg->connection()->decodeText(msg->safeTrailing());
 	KviIrcUserDataBase * db = msg->connection()->userDataBase();
-	KviIrcUserEntry * e = db->tqfind(szNick);
+	KviIrcUserEntry * e = db->find(szNick);
 	if(e)
 	{
 		e->setUser(szUser);
@@ -1253,7 +1253,7 @@ void KviServerParser::parseNumericWhoisServer(KviIrcMessage *msg)
 	TQString szServ = msg->connection()->decodeText(msg->safeParam(2));
 
 	KviIrcUserDataBase * db = msg->connection()->userDataBase();
-	KviIrcUserEntry * e = db->tqfind(szNick);
+	KviIrcUserEntry * e = db->find(szNick);
 	if(e)e->setServer(szServ);
 	KviQuery * q = msg->connection()->findQuery(szNick);
 	if(q) q->updateLabelText();
@@ -1683,7 +1683,7 @@ void KviServerParser::parseNumericAway(KviIrcMessage * msg)
 			szNewNick.append("AWAY");
 		} else {
 			szNewNick = KVI_OPTION_STRING(KviOption_stringCustomAwayNick);
-			szNewNick.tqreplace("%nick%",nick);
+			szNewNick.replace("%nick%",nick);
 		}
 
 		if(_OUTPUT_PARANOIC)
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp
index bfa7eb5c..d4b02e02 100644
--- a/src/kvirc/ui/kvi_actiondrawer.cpp
+++ b/src/kvirc/ui/kvi_actiondrawer.cpp
@@ -204,11 +204,11 @@ void KviActionDrawer::fill()
 	{
 		KviActionCategory * c = a->category();
 		if(!c)c = KviActionManager::categoryGeneric();
-		KviActionDrawerPage * p = pages.tqfind(c->visibleName());
+		KviActionDrawerPage * p = pages.find(c->visibleName());
 		if(!p)
 		{
 			p = new KviActionDrawerPage(this,c->description());
-			pages.tqreplace(c->visibleName(),p);
+			pages.replace(c->visibleName(),p);
 			addTab(p,c->visibleName());
 			//p->show();
 		}
@@ -216,7 +216,7 @@ void KviActionDrawer::fill()
 		++it;
 	}
 
-	KviActionDrawerPage * p = pages.tqfind(KviActionManager::categoryIrc()->visibleName());
+	KviActionDrawerPage * p = pages.find(KviActionManager::categoryIrc()->visibleName());
 	if(p)
 	{
 		int iii = indexOf(p);
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 206cadbe..1c01b238 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -167,14 +167,14 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 	m_pBanEditorButton = new KviWindowToolPageButton(KVI_SMALLICON_UNBAN,KVI_SMALLICON_BAN,__tr2qs("Ban Editor"),buttonContainer(),false,"ban_editor_button");
 	connect(m_pBanEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanEditor()));
 	
-	if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('e'))
+	if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('e'))
 	{
 		m_pBanExceptionEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_BANUNEXCEPT,KVI_SMALLICON_BANEXCEPT,__tr2qs("Ban Exception Editor"),buttonContainer(),false,"ban_exception_editor_button");
 		connect(m_pBanExceptionEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleBanExceptionEditor()));
 	} else {
 		m_pBanExceptionEditorButton=0;
 	}
-	if(m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains('I'))
+	if(m_pConsole->connection()->serverInfo()->supportedListModes().contains('I'))
 	{
 		m_pInviteEditorButton =new KviWindowToolPageButton(KVI_SMALLICON_INVITEUNEXCEPT,KVI_SMALLICON_INVITEEXCEPT,__tr2qs("Invite Exception Editor"),buttonContainer(),false,"invite_exception_editor_button");
 		connect(m_pInviteEditorButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(toggleInviteEditor()));
@@ -265,7 +265,7 @@ void KviChannel::textViewRightClicked()
 void KviChannel::getBaseLogFileName(TQString &buffer)
 {
 	TQString szChan(windowName());
-	szChan.tqreplace(".","%2e");
+	szChan.replace(".","%2e");
 	if (console()->connection())
 	{
 		buffer=szChan;
@@ -569,14 +569,14 @@ TQSize KviChannel::tqsizeHint() const
 
 void KviChannel::setChannelMode(char  mode,bool bAdd)
 {
-	if(!m_pConsole->connection()->serverInfo()->supportedListModes().tqcontains(mode)){
+	if(!m_pConsole->connection()->serverInfo()->supportedListModes().contains(mode)){
 		if(bAdd)
 		{
-			if(!(m_szChannelMode.tqcontains(mode)))m_szChannelMode.append(mode);
+			if(!(m_szChannelMode.contains(mode)))m_szChannelMode.append(mode);
 		} else {
-			if(m_szChannelMode.tqcontains(mode))
+			if(m_szChannelMode.contains(mode))
 			{
-				m_szChannelMode.tqreplace(mode,"");
+				m_szChannelMode.replace(mode,"");
 			}
 		}
 		updateModeLabel();
@@ -602,7 +602,7 @@ void KviChannel::addHighlightedUser(const char * nick)
 {
 	if(!m_pUserListView->findEntry(nick))return;
 	else
-   		m_pTmpHighLighted->tqreplace(nick,new TQString());
+   		m_pTmpHighLighted->replace(nick,new TQString());
 }
 
 void KviChannel::removeHighlightedUser(const char * nick)
@@ -1319,7 +1319,7 @@ void KviChannel::getChannelActivityStats(KviChannelActivityStats * s)
 			(a->uActionType == KVI_USERACTION_NOTICE) ||
 			(a->uActionType == KVI_USERACTION_ACTION))
 		{
-			if(!userDict.tqfind(a->szNick))
+			if(!userDict.find(a->szNick))
 			{
 				if(isOn(a->szNick.ascii()))
 				{
@@ -1379,8 +1379,8 @@ void KviChannel::closeEvent(TQCloseEvent *e)
 		if(connection())
 		{
 			TQString tmp = KVI_OPTION_STRING(KviOption_stringPartMessage);
-			tmp.tqreplace(";","\\;");
-			tmp.tqreplace("\n"," ");
+			tmp.replace(";","\\;");
+			tmp.replace("\n"," ");
 			KviKvsVariant vRet;
 			
 			if(KviKvsScript::evaluate(tmp,this,0,&vRet))vRet.asString(tmp);
@@ -1605,12 +1605,12 @@ void KviChannel::preprocessMessage(TQString & szMessage)
 {
 	TQStringList strings = TQStringList::split(" ",szMessage, TRUE);
 	for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) {
-		if((*it).tqcontains('\r')) continue;
+		if((*it).contains('\r')) continue;
 		TQString tmp = KviMircCntrl::stripControlBytes(*it);
 		if( findEntry(*it) ) 	*it=TQString("\r!n\r%1\r").tqarg(*it);
 		if(m_pConsole)
 			if(m_pConsole->connection())
-				if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0]))
+				if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0]))
 					if((*it)==tmp)
 						*it=TQString("\r!c\r%1\r").tqarg(*it);
 					else
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index 0a824495..f1d17326 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -285,7 +285,7 @@ public:
 
     void addHighlightedUser(const char * nick);
     void removeHighlightedUser(const char * nick);
-    bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->tqfind(nick); };
+    bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); };
     KviIrcView * messageView() const { return m_pMessageView; };
 	virtual void lostUserFocus();
 	virtual void getTaskBarTipText(TQString &buffer);
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index a843ae19..0b084477 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -636,7 +636,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c
 	{
 		while(aux->tqunicode())
 		{
-			if( KVI_OPTION_STRING(KviOption_stringWordSplitters).tqfind(*aux) > -1 )
+			if( KVI_OPTION_STRING(KviOption_stringWordSplitters).find(*aux) > -1 )
 				szSource.append(' ');
 			else
 				szSource.append(*aux);
@@ -649,7 +649,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c
 	szSource.prepend(' ');
 	if(KVI_OPTION_BOOL(KviOption_boolAlwaysHighlightNick) && connection())
 	{
-		if(szSource.tqfind(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1)
+		if(szSource.find(TQString(" %1 ").tqarg(connection()->userInfo()->nickName()),0,false) > -1)
 			return triggerOnHighlight(wnd,type,nick,user,host,szMsg,connection()->userInfo()->nickName());
 	}
 
@@ -661,7 +661,7 @@ int KviConsole::applyHighlighting(KviWindow *wnd,int type,const TQString &nick,c
 			if((*it).isEmpty())
 				continue;
 			// FIXME : This is SLOOOOOOOOW (TQString -> ascii translation!!) !!!!
-			if(szSource.tqfind(TQString(" %1 ").tqarg(*it),0,false) > -1)
+			if(szSource.find(TQString(" %1 ").tqarg(*it),0,false) > -1)
 			{
 				return triggerOnHighlight(wnd,type,nick,user,host,szMsg,*it);
 			}
@@ -926,7 +926,7 @@ void KviConsole::avatarChanged(KviAvatar * avatar,const TQString &nick,const TQS
 	{
 		// cache it
 		if(avatar)
-			KviAvatarCache::instance()->tqreplace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data());
+			KviAvatarCache::instance()->replace(avatar->identificationString(),KviIrcMask(nick,user,host),currentNetworkName().utf8().data());
 		else
 			KviAvatarCache::instance()->remove(KviIrcMask(nick,user,host),currentNetworkName().utf8().data());
 	}
@@ -1001,7 +1001,7 @@ void KviConsole::resetAvatarForMatchingUsers(KviRegisteredUser * u)
 KviAvatar * KviConsole::setAvatar(const TQString &nick,const TQString &user,const TQString &host,const TQString &szLocalPath,const TQString &szName)
 {
 	if(!connection())return 0;
-	KviIrcUserEntry * e = connection()->userDataBase()->tqfind(nick);
+	KviIrcUserEntry * e = connection()->userDataBase()->find(nick);
 	if(e)
 	{
 		// User and host must match
@@ -1043,7 +1043,7 @@ KviAvatar * KviConsole::defaultAvatarFromOptions()
 KviAvatar * KviConsole::currentAvatar()
 {
 	if(!connection())return 0;
-	KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName());
+	KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName());
 	if(!e)return 0;
 	KviAvatar * a = e->avatar();
 	if(!a)
@@ -1061,7 +1061,7 @@ KviAvatar * KviConsole::currentAvatar()
 void KviConsole::setAvatarFromOptions()
 {
 	if(!connection())return;
-	KviIrcUserEntry * e = connection()->userDataBase()->tqfind(connection()->userInfo()->nickName());
+	KviIrcUserEntry * e = connection()->userDataBase()->find(connection()->userInfo()->nickName());
 	if(!e)return;
 	KviAvatar * a = defaultAvatarFromOptions();
 	if(a)
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
index f9a7a134..83ac72eb 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
@@ -155,7 +155,7 @@
 
 		if(cur)
 		{
-			KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->tqfindItem(cur->szEngineName.ptr());
+			KviTalListBoxItem * it = (KviTalListBoxItem *)m_pListBox->findItem(cur->szEngineName.ptr());
 			if(it)
 			{
 				m_pEnableCheck->setChecked(true);
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index b4e06306..828eb02d 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -154,7 +154,7 @@ void KviCustomToolBar::unfilterChild(TQObject * o)
 {
 	if(m_pFilteredChildren)
 	{
-		bool * b = m_pFilteredChildren->tqfind(o);
+		bool * b = m_pFilteredChildren->find(o);
 		if(b)
 		{
 			if(!*b)((TQWidget *)o)->setEnabled(false);
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index cf7d5a7d..dfae5860 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -247,7 +247,7 @@ void KviFrame::restoreModuleExtensionToolBars()
 	for(TQStringList::Iterator it = KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).begin();it != KVI_OPTION_STRINGLIST(KviOption_stringlistModuleExtensionToolbars).end();++it)
 	{
 		TQString szEntry = *it;
-		int idx = szEntry.tqfind(':');
+		int idx = szEntry.find(':');
 		if(idx != -1)
 		{
 			TQString szMod = szEntry.left(idx);
@@ -509,7 +509,7 @@ void KviFrame::saveWindowProperties(KviWindow * wnd,const char * szSection)
 		unsigned int minVal = time(0);
 		while(it.current() && minVal)
 		{
-			TQString * pVal = it.current()->tqfind("EntryTimestamp");
+			TQString * pVal = it.current()->find("EntryTimestamp");
 			if(pVal)
 			{
 				bool bOk;
@@ -805,7 +805,7 @@ void KviFrame::unhighlightWindowsOfContext(KviIrcContext * c)
 
 void KviFrame::setActiveWindow(KviWindow *wnd)
 {
-	// ASSERT(m_pWinList->tqfindRef(wnd))
+	// ASSERT(m_pWinList->findRef(wnd))
 	if(wnd->isMinimized())wnd->restore();
 	if(wnd->mdiParent())wnd->setFocus();
 	else wnd->delayedAutoRaise();
@@ -867,7 +867,7 @@ void KviFrame::childConnectionUserModeChange(KviIrcConnection * c)
 
 void KviFrame::childWindowActivated(KviWindow *wnd)
 {
-	// ASSERT(m_pWinList->tqfindRef(wnd))
+	// ASSERT(m_pWinList->findRef(wnd))
 	if(g_pActiveWindow == wnd)return;
 	if(g_pActiveWindow)g_pActiveWindow->lostUserFocus();
 	// YES: it's HERE!
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
index ebc7e67c..5f18eb45 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/kvi_frame.h
@@ -138,7 +138,7 @@ public:
 	// window list. This is useful for asynchronous functions
 	// that keep a window pointer and need to ensure that it is still
 	// valid after an uncontrolled delay. (Think of a /timer implementation)
-	bool windowExists(KviWindow * wnd){ return (m_pWinList->tqfindRef(wnd) != -1); };
+	bool windowExists(KviWindow * wnd){ return (m_pWinList->findRef(wnd) != -1); };
 	// The number of consoles in this frame
 	unsigned int consoleCount();
 	// Creates a new console window. DON'T use the KviConsole constructor directly.
diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp
index 8ddb9b18..a4c89ad0 100644
--- a/src/kvirc/ui/kvi_imagedialog.cpp
+++ b/src/kvirc/ui/kvi_imagedialog.cpp
@@ -139,7 +139,7 @@ KviImageDialog::KviImageDialog(TQWidget * par,
 		m_pTypeList->append(KID_TYPE_FULL_PATH);
 	}
 
-	int idx = m_pTypeList->tqfindIndex(initialType);
+	int idx = m_pTypeList->findIndex(initialType);
 	if(idx < 0)idx = 0;
 
 	TQWidget * l = new TQWidget(this);
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index eafce469..1a255fc9 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -797,7 +797,7 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e)
 #ifdef COMPILE_USE_QT4
 			int occ = szClip.count(TQChar('\n'));
 #else
-			int occ = szClip.tqcontains(TQChar('\n'));
+			int occ = szClip.contains(TQChar('\n'));
 #endif
 	
 			if(!szClip.isEmpty())
@@ -807,10 +807,10 @@ void KviInputEditor::mousePressEvent(TQMouseEvent *e)
 					szClip.truncate(60);
 					szClip.append("...");
 				}
-				szClip.tqreplace(TQChar('&'),"&amp;");
-				szClip.tqreplace(TQChar('<'),"&lt;");
-				szClip.tqreplace(TQChar('>'),"&gt;");
-				szClip.tqreplace(TQChar('\n'),"<br>");
+				szClip.replace(TQChar('&'),"&amp;");
+				szClip.replace(TQChar('<'),"&lt;");
+				szClip.replace(TQChar('>'),"&gt;");
+				szClip.replace(TQChar('\n'),"<br>");
 	
 				TQString label = "<center><b>";
 				label += __tr2qs("Clipboard");
@@ -985,13 +985,13 @@ void KviInputEditor::insertText(const TQString &text)
 
 	//szText.replaceAll('\t'," "); //Do not paste tabs
 
-	//szText.tqreplace(TQRegExp("\t")," "); // do not paste tabs
+	//szText.replace(TQRegExp("\t")," "); // do not paste tabs
 
 	m_bUpdatesEnabled = false;
 	removeSelected();
 	m_bUpdatesEnabled = true;
 
-	if(szText.tqfind('\n') == -1)
+	if(szText.find('\n') == -1)
 	{
 		m_szTextBuffer.insert(m_iCursorPosition,szText);
 		m_szTextBuffer.truncate(m_iMaxBufferSize);
@@ -1001,7 +1001,7 @@ void KviInputEditor::insertText(const TQString &text)
 		TQString szBlock;
 		while(!szText.isEmpty())
 		{
-			int idx = szText.tqfind('\n');
+			int idx = szText.find('\n');
 			if(idx != -1)
 			{
 				szBlock = szText.left(idx);
@@ -1046,7 +1046,7 @@ void KviInputEditor::pasteClipboardWithConfirmation()
 	if(!c)return;
 	TQString szText = c->text(TQClipboard::Clipboard);
 
-	if(szText.tqcontains(TQChar('\n')) > 0)
+	if(szText.contains(TQChar('\n')) > 0)
 	{
 		if(m_pInputParent->inherits("KviInput"))
 			((KviInput*)(m_pInputParent))->multiLinePaste(szText);
@@ -1061,7 +1061,7 @@ void KviInputEditor::pasteSelectionWithConfirmation()
 	if(!c)return;
 	TQString szText = c->text(c->supportsSelection() ? TQClipboard::Selection : TQClipboard::Clipboard);
 
-	if(szText.tqcontains(TQChar('\n')) > 0)
+	if(szText.contains(TQChar('\n')) > 0)
 	{
 		if(m_pInputParent->inherits("KviInput"))
 			((KviInput*)(m_pInputParent))->multiLinePaste(szText);
@@ -1779,10 +1779,10 @@ void KviInputEditor::getWordBeforeCursor(TQString &buffer,bool * bIsFirstWordInL
 
 	buffer = m_szTextBuffer.left(m_iCursorPosition);
 
-	int idx = buffer.tqfindRev(' ');
-	int idx2 = buffer.tqfindRev(','); // This is for comma separated lists...
-	int idx3 = buffer.tqfindRev('(');
-	int idx4 = buffer.tqfindRev('"');
+	int idx = buffer.findRev(' ');
+	int idx2 = buffer.findRev(','); // This is for comma separated lists...
+	int idx3 = buffer.findRev('(');
+	int idx4 = buffer.findRev('"');
 	if(idx2 > idx)idx = idx2;
 	if(idx3 > idx)idx = idx3;
 	if(idx4 > idx)idx = idx4;
@@ -2485,7 +2485,7 @@ void KviInput::keyPressEvent(TQKeyEvent *e)
 #ifdef COMPILE_USE_QT4
 								int nLines = szText.count('\n') + 1;
 #else
-								int nLines = szText.tqcontains('\n') + 1;
+								int nLines = szText.contains('\n') + 1;
 #endif
 								if(nLines > 15)
 								{
@@ -2551,7 +2551,7 @@ void KviInput::multilineEditorButtonToggled(bool bOn)
 		m_pMultiLineEditor = KviScriptEditor::createInstance(this);
 		TQString szText = __tr2qs("<Ctrl+Return>; submits, <Alt+Backspace>; hides this editor");
 		// compatibility entry to avoid breaking translation just before a release... :)
-		szText.tqreplace("Alt+Backspace","Ctrl+Backspace");
+		szText.replace("Alt+Backspace","Ctrl+Backspace");
 		m_pMultiLineEditor->setFindText(szText);
 		m_pMultiLineEditor->setFindLineeditReadOnly(true);
 		m_pInputEditor->hide();
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index b8b7903f..25be1cc5 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -1303,11 +1303,11 @@ void KviIrcView::getLinkEscapeCommand(TQString &buffer,const TQString &szPayload
 {
 	if(szPayload.isEmpty())return;
 
-	int idx = szPayload.tqfind(escape_label);
+	int idx = szPayload.find(escape_label);
 	if(idx == -1)return;
 	idx += escape_label.length();
 	
-	int idx2 = szPayload.tqfind("[!",idx);
+	int idx2 = szPayload.find("[!",idx);
 	int len = idx2 == -1 ? szPayload.length() - idx : idx2 - idx;
 
 	buffer = szPayload.mid(idx,len);
@@ -2128,7 +2128,7 @@ highlighting_check_loop:
 		// yet more optimized
 		if(*((unsigned short *)p) < 0xff)
 			if(void * jmp_address = char_to_check_jump_table[*((unsigned short *)p)])goto *jmp_address;
-			// goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- tqreplace 0 with &nothing_found
+			// goto *(char_to_check_jump_table[*((unsigned char *)p)]); <--- replace 0 with &nothing_found
 //nothing_found:
 		p++;
 		goto highlighting_check_loop;
@@ -3968,7 +3968,7 @@ void KviIrcView::toggleToolWidget()
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
-// The IrcView : tqfind
+// The IrcView : find
 //
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -4063,7 +4063,7 @@ void KviIrcView::findNext(const TQString& szText,bool bCaseS,bool bRegExp,bool b
 				idx = re.search(l->szText,0);
 			} else {
 				TQString tmp = l->szText;
-				idx = tmp.tqfind(szText,0,bCaseS);
+				idx = tmp.find(szText,0,bCaseS);
 			}
 
 			if(idx != -1)
@@ -4116,7 +4116,7 @@ void KviIrcView::findPrev(const TQString& szText,bool bCaseS,bool bRegExp,bool b
 				idx = re.search(l->szText,0);
 			} else {
 				TQString tmp = l->szText;
-				idx = tmp.tqfind(szText,0,bCaseS);;
+				idx = tmp.find(szText,0,bCaseS);;
 			}
 
 			if(idx != -1)
@@ -4520,11 +4520,11 @@ void KviIrcView::mouseDoubleClickEvent(TQMouseEvent *e)
 					if((plmn.tqunicode() == '+') || (plmn.tqunicode() == '-'))
 					{
 						TQString target(m_pKviWindow->windowName());
-						target.tqreplace("\\","\\\\");
-						target.tqreplace("\"","\\\"");
-						target.tqreplace(";","\\;");
-						target.tqreplace("$","\\$");
-						target.tqreplace("%","\\%");
+						target.replace("\\","\\\\");
+						target.replace("\"","\\\"");
+						target.replace(";","\\;");
+						target.replace("$","\\$");
+						target.replace("%","\\%");
 						TQChar flag = linkCmd[2];
 						switch(flag.tqunicode())
 						{
@@ -4929,7 +4929,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin
 			tip+="</nowrap></font></u></td></tr><tr><td>";
 			TQMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
 			
-			if(linkText.tqfind('*') != -1)
+			if(linkText.find('*') != -1)
 			{
 				if(linkText.length() > 1)tip += __tr2qs("Unable to look it up hostname: Hostname appears to be masked");
 				else tip += __tr2qs("Unable to look it up hostname: Unknown host");
@@ -4955,7 +4955,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin
 			}
 			tip+="</nowrap></font></u></td></tr><tr><td>";
 			
-			if(linkText.tqfind('*') != -1)
+			if(linkText.find('*') != -1)
 			{
 				if(linkText.length() > 1)tip += __tr2qs("Server appears to be a network hub<br>");
 				else tip += __tr2qs("Unknown server<br>"); // might happen...
@@ -5007,7 +5007,7 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin
 			{
 				if(console()->connection())
 				{
-					KviIrcUserEntry * e = console()->connection()->userDataBase()->tqfind(linkText);
+					KviIrcUserEntry * e = console()->connection()->userDataBase()->find(linkText);
 					if(e)
 					{
 						TQString buffer;
@@ -5035,8 +5035,8 @@ void KviIrcView::doLinkToolTip(const TQRect &rct,TQString &linkCmd,TQString &lin
 					TQString chanMode;
 					c->getChannelModeString(chanMode);
 					TQString topic = KviMircCntrl::stripControlBytes(c->topicWidget()->topic());
-					topic.tqreplace("<","&lt;");
-					topic.tqreplace(">","&gt;");
+					topic.replace("<","&lt;");
+					topic.replace(">","&gt;");
 					KviIrcUrl::join(szUrl,console()->connection()->target()->server());
 					szUrl.append(szChan);
 					KviTQString::sprintf(buf,__tr2qs("<b>%Q</b> (<u><font color=\"blue\"><nowrap>"
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index f00100a3..f0040a15 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -254,7 +254,7 @@ void KviMaskEditor::searchTextChanged ( const TQString & text)
 		{
 			pMaskItem->setVisible(true);
 		} else {
-			if(pMaskItem->tqmask()->szMask.tqcontains(text))
+			if(pMaskItem->tqmask()->szMask.contains(text))
 				pMaskItem->setVisible(true);
 			else 
 				pMaskItem->setVisible(false);
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 398d49e7..7d4a9b62 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -378,7 +378,7 @@ void KviMdiManager::childMaximized(KviMdiChild * lpC)
 void KviMdiManager::childMinimized(KviMdiChild * lpC,bool bWasMaximized)
 {
 	__range_valid(lpC);
-	if(m_pZ->tqfindRef(lpC) == -1)return;
+	if(m_pZ->findRef(lpC) == -1)return;
 	if(m_pZ->count() > 1)
 	{
 		m_pZ->setAutoDelete(false);
@@ -930,7 +930,7 @@ void KviMdiManager::restoreAll()
 	while(!list.isEmpty())
 	{
 		KviMdiChild *lpC=list.first();
-		if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).tqcontains("CONSOLE") ))
+		if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).contains("CONSOLE") ))
             lpC->restore();
 		list.removeFirst();
 	}
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index 585b75b8..1c432237 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -266,7 +266,7 @@ void KviMenuBar::newConnectionToServer(int id)
 		{
 			KviKvsScript::run("options.edit KviServerOptionsWidget",m_pFrm->firstConsole());
 		} else {
-			text.tqreplace(TQString("&"),TQString(""));
+			text.replace(TQString("&"),TQString(""));
 			KviStr szCommand;
 			if(KviIrcUrl::parse(text.utf8().data(),szCommand,KVI_IRCURL_CONTEXT_NEW))
 				KviKvsScript::run(szCommand.ptr(),m_pFrm->firstConsole());
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index 11f781b4..94071317 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -125,7 +125,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
 		KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground);
 		cb->setEnabled(isEnabled);
 		m_pCheckBoxes->append(cb);
-		cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode()));
+		cb->setChecked(m_szMode.contains((char)ccc.tqunicode()));
 		i++;
 		g->addMultiCellWidget(cb,i,i,0,2);
 	}
@@ -174,19 +174,19 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
 			szModes = c->connection()->serverInfo()->supportedChannelModes();
 	}
 
-	int idx = szModes.tqfindRev(',');
+	int idx = szModes.findRev(',');
 	if(idx != -1)szModes.remove(0,idx+1);
 
-	szModes.tqreplace("p","");
-	szModes.tqreplace("s","");
-	szModes.tqreplace("t","");
-	szModes.tqreplace("n","");
-	szModes.tqreplace("m","");
-	szModes.tqreplace("i","");
-	szModes.tqreplace(",","");
-	szModes.tqreplace("b","");
-	szModes.tqreplace("k","");
-	szModes.tqreplace("l","");
+	szModes.replace("p","");
+	szModes.replace("s","");
+	szModes.replace("t","");
+	szModes.replace("n","");
+	szModes.replace("m","");
+	szModes.replace("i","");
+	szModes.replace(",","");
+	szModes.replace("b","");
+	szModes.replace("k","");
+	szModes.replace("l","");
 
 	while(!szModes.isEmpty())
 	{
@@ -197,7 +197,7 @@ KviModeEditor::KviModeEditor(TQWidget * par,KviWindowToolPageButton* button,cons
 		KviStyledCheckBox * cb = new KviStyledCheckBox(tmp,pBackground);
 		cb->setEnabled(isEnabled);
 		m_pCheckBoxes->append(cb);
-		cb->setChecked(m_szMode.tqcontains((char)ccc.tqunicode()));
+		cb->setChecked(m_szMode.contains((char)ccc.tqunicode()));
 		i++;
 		g->addMultiCellWidget(cb,i,i,0,2);
 	}
@@ -311,15 +311,15 @@ void KviModeEditor::commit()
 	for(KviStyledCheckBox * cb = m_pCheckBoxes->first();cb;cb = m_pCheckBoxes->next())
 	{
 		TQString sz = cb->text();
-		sz.tqreplace("&","");
+		sz.replace("&","");
 		if(sz.length() > 0)
 		{
 			TQChar ccc = sz[0];
 			if(cb->isChecked())
 			{
-				if(!m_szMode.tqcontains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode());
+				if(!m_szMode.contains((char)ccc.tqunicode()))szPlusModes.append((char)ccc.tqunicode());
 			} else {
-				if(m_szMode.tqcontains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode());
+				if(m_szMode.contains((char)ccc.tqunicode()))szMinusModes.append((char)ccc.tqunicode());
 			}
 		}
 	}
diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp
index 8725933a..7c817dd9 100755
--- a/src/kvirc/ui/kvi_modew.cpp
+++ b/src/kvirc/ui/kvi_modew.cpp
@@ -143,7 +143,7 @@ void KviModeWidget::editorReturnPressed()
 	TQString szMinusModes;
 	for(int i=0; i<szCurModes.length(); i++)
 	{
-		if(szNewModes.tqcontains(szCurModes[i]))
+		if(szNewModes.contains(szCurModes[i]))
 			szNewModes.remove(szCurModes[i]);
 		else
 			szMinusModes+=szCurModes[i];
@@ -165,8 +165,8 @@ void KviModeWidget::editorTextChanged( const TQString & text)
 	TQString szText=text;
 	for(i=0;i<szText.length();i++)
 	{
-		if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().tqcontains(szText[i]) || 
-			szText.tqfind(szText[i])<i )
+		if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().contains(szText[i]) || 
+			szText.find(szText[i])<i )
 			szText.remove(i,1);
 	}	
 	m_pLineEdit->setText(szText);
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index ed1801f2..ce26661f 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -137,7 +137,7 @@ void KviQuery::updateLabelText()
 TQString KviQuery::getInfoLabelTipText()
 {
 	TQString txt;
-	KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName);
+	KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName);
 	if(e)
 	{
 		TQString tmp;
@@ -171,9 +171,9 @@ TQString KviQuery::getInfoLabelTipText()
 			else
 				tmp=__tr2qs("%1 is %2").tqarg(m_szName).tqarg(szMask);
 			
-			tmp.tqreplace('&',"&amp;");
-			tmp.tqreplace('<',"&lt;");
-			tmp.tqreplace('>',"&gt;");
+			tmp.replace('&',"&amp;");
+			tmp.replace('<',"&lt;");
+			tmp.replace('>',"&gt;");
 			
 			txt += tmp;
 			
@@ -199,9 +199,9 @@ TQString KviQuery::getInfoLabelTipText()
 			txt+="<tr><td>";
 			tmp=__tr2qs("Common channels with %1: %2").tqarg(m_szName).tqarg(szChans);
 			
-			tmp.tqreplace('&',"&amp;");
-			tmp.tqreplace('<',"&lt;");
-			tmp.tqreplace('>',"&gt;");
+			tmp.replace('&',"&amp;");
+			tmp.replace('<',"&lt;");
+			tmp.replace('>',"&gt;");
 			
 			txt+=tmp;
 			txt +="</td></tr>";	
@@ -221,7 +221,7 @@ TQString KviQuery::getInfoLabelText()
 	TQString tmp;
 	if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel))
 	{
-		KviIrcUserEntry * e = connection()->userDataBase()->tqfind(m_szName);
+		KviIrcUserEntry * e = connection()->userDataBase()->find(m_szName);
 		if(e)
 		{
 			TQString szMask;
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index c7d8bba9..861facd7 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -259,7 +259,7 @@ void KviStatusBar::recalcMinimumHeight()
 
 bool KviStatusBar::appletExists(KviStatusBarApplet * pApplet)
 {
-	return (m_pAppletList->tqfindRef(pApplet) != -1);
+	return (m_pAppletList->findRef(pApplet) != -1);
 }
 
 KviStatusBarApplet * KviStatusBar::appletAt(const TQPoint &pnt,bool bBestMatch)
@@ -394,7 +394,7 @@ void KviStatusBar::appletsPopupAboutToShow()
 
 KviStatusBarApplet * KviStatusBar::createApplet(const TQString &szInternalName)
 {
-	KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->tqfind(szInternalName);
+	KviStatusBarAppletDescriptor * d = m_pAppletDescriptors->find(szInternalName);
 	if(!d)return 0;
 	return d->create(this);
 }
@@ -419,7 +419,7 @@ void KviStatusBar::appletsPopupActivated(int id)
 		{
 			if(m_pClickedApplet)
 			{
-				int idx = m_pAppletList->tqfindRef(m_pClickedApplet);
+				int idx = m_pAppletList->findRef(m_pClickedApplet);
 				if(idx != -1)
 				{
 					// try to put the new applet just after the clicked one
@@ -444,7 +444,7 @@ void KviStatusBar::appletsPopupActivated(int id)
 
 void KviStatusBar::registerAppletDescriptor(KviStatusBarAppletDescriptor * d)
 {
-	m_pAppletDescriptors->tqreplace(d->internalName(),d);
+	m_pAppletDescriptors->replace(d->internalName(),d);
 }
 
 void KviStatusBar::registerApplet(KviStatusBarApplet * a)
@@ -518,7 +518,7 @@ void KviStatusBar::mouseMoveEvent(TQMouseEvent * e)
 	}
 	
 	m_pAppletList->removeRef(m_pClickedApplet);
-	int idx = m_pAppletList->tqfindRef(a);
+	int idx = m_pAppletList->findRef(a);
 	if(idx == -1)m_pAppletList->append(m_pClickedApplet); // uhg ?
 	else {
 		TQPoint p = a->mapFromGlobal(g);
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 9a0c0b9c..37bb7a88 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -777,7 +777,7 @@ inline KviTaskBarItem * KviClassicTaskBar::prevItem(void)
 
 inline bool KviClassicTaskBar::setIterationPointer(KviTaskBarItem * it)
 {
-	return (m_pButtonList->tqfindRef((const KviTaskBarButton *)it) != -1);
+	return (m_pButtonList->findRef((const KviTaskBarButton *)it) != -1);
 }
 
 
diff --git a/src/kvirc/ui/kvi_texticonwin.h b/src/kvirc/ui/kvi_texticonwin.h
index 83c9c3d6..af98cd37 100644
--- a/src/kvirc/ui/kvi_texticonwin.h
+++ b/src/kvirc/ui/kvi_texticonwin.h
@@ -44,7 +44,7 @@ private:
 	TQWidget       * m_pOwner;
 	TQString         m_szTypedSeq;
 	TQString         m_szCurFullSeq;
-	bool            m_bAltMode; // in alt mode the itemSelected() string tqcontains
+	bool            m_bAltMode; // in alt mode the itemSelected() string contains
 	                            // also the CTRL+I escape code
 	int             m_iTimerId;
 public:
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 8ae19621..d4a3ecd2 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -499,9 +499,9 @@ void KviTopicWidget::updateToolTip()
 
 		TQString tmp = m_szTopic;
 		
-		tmp.tqreplace('&',"&amp;");
-		tmp.tqreplace('<',"&lt;");
-		tmp.tqreplace('>',"&gt;");
+		tmp.replace('&',"&amp;");
+		tmp.replace('<',"&lt;");
+		tmp.replace('>',"&gt;");
 		tmp = convertToHtml(tmp);
 		
 		txt += tmp;
@@ -563,7 +563,7 @@ void KviTopicWidget::mouseDoubleClickEvent(TQMouseEvent *)
 			KviChannel *chan = ((KviChannel *)w);
 			maxlen=chan->connection()->serverInfo()->maxTopicLen();
 			chan->getChannelModeString(szModes);
-			if(szModes.tqcontains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) )  {
+			if(szModes.contains('t') && !( chan->isMeHalfOp() || chan->isMeOp() || chan->isMeChanOwner() || chan->isMeChanAdmin() || chan->connection()->userInfo()->hasUserMode('o') || chan->connection()->userInfo()->hasUserMode('O')) )  {
 				bCanEdit=false;
 				}
 			break;
@@ -643,13 +643,13 @@ bool KviTopicWidget::eventFilter(TQObject *object,TQEvent *e)
 	{
 		switch( e->type() ) {
 		case TQEvent::MouseButtonPress:
-			if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) {
+			if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).contains( ((TQMouseEvent*)e)->pos() ) ) {
 				complete(m_pCompletionBox->index(m_pCompletionBox->itemAt(((TQMouseEvent*)e)->pos())));
 				return TRUE;
 			}
 			break;
 		case TQEvent::MouseButtonRelease:
-			if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).tqcontains( ((TQMouseEvent*)e)->pos() ) ) {
+			if ( TQT_TQRECT_OBJECT(m_pCompletionBox->rect()).contains( ((TQMouseEvent*)e)->pos() ) ) {
 				TQMouseEvent tmp( TQEvent::MouseButtonDblClick,
 						((TQMouseEvent*)e)->pos(), ((TQMouseEvent*)e)->button(), ((TQMouseEvent*)e)->state() ) ;
 				// will hide popup
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index d96aa532..1b55386a 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -605,7 +605,7 @@ KviUserListEntry * KviUserListView::join(const TQString &nick,const TQString &us
 		const TQString &host,int iFlags)
 {
 	// Ok..an user joins the channel
-	KviUserListEntry * it = m_pEntryDict->tqfind(nick);
+	KviUserListEntry * it = m_pEntryDict->find(nick);
 	if(it == 0)
 	{
 		// add an entry to the global dict
@@ -648,7 +648,7 @@ void KviUserListView::triggerUpdate()
 
 bool KviUserListView::avatarChanged(const TQString &nick)
 {
-	KviUserListEntry * it = m_pEntryDict->tqfind(nick);
+	KviUserListEntry * it = m_pEntryDict->find(nick);
 	if(it)
 	{
 		int oldH = it->m_iHeight;
@@ -704,7 +704,7 @@ bool KviUserListView::userActionVerifyMask(const TQString &nick,const TQString &
 	// change (unless they were not known at all)
 	// This will also update the username and hostname
 	// if needed.
-	KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick));
+	KviUserListEntry * it = m_pEntryDict->find(TQString(nick));
 	if(it)
 	{
 		it->m_lastActionTime = kvi_unixTime();
@@ -750,7 +750,7 @@ void KviUserListView::userAction(const TQString &nick,const TQString &user,const
 	// on the channel, so we can keep track of his channeel
 	// idle time. This will also update the username and hostname
 	// if needed.
-	KviUserListEntry * it = m_pEntryDict->tqfind(TQString(nick));
+	KviUserListEntry * it = m_pEntryDict->find(TQString(nick));
 	if(it)
 	{
 		it->m_lastActionTime = kvi_unixTime();
@@ -773,7 +773,7 @@ void KviUserListView::userAction(KviIrcMask *user,int actionTemperature)
 	// on the channel, so we can keep track of his channeel
 	// idle time. This will also update the username and hostname
 	// if needed.
-	KviUserListEntry * it = m_pEntryDict->tqfind(TQString(user->nick()));
+	KviUserListEntry * it = m_pEntryDict->find(TQString(user->nick()));
 	if(it)
 	{
 		it->m_lastActionTime = kvi_unixTime();
@@ -793,7 +793,7 @@ void KviUserListView::userAction(const TQString &nick,int actionTemperature)
 	// on the channel, so we can keep track of his channeel
 	// idle time. This will also update the username and hostname
 	// if needed.
-	KviUserListEntry * it = m_pEntryDict->tqfind(nick);
+	KviUserListEntry * it = m_pEntryDict->find(nick);
 	if(it)
 	{
 		it->m_lastActionTime = kvi_unixTime();
@@ -806,14 +806,14 @@ void KviUserListView::userAction(const TQString &nick,int actionTemperature)
 
 kvi_time_t KviUserListView::getUserJoinTime(const TQString &szNick)
 {
-	KviUserListEntry * e = m_pEntryDict->tqfind(szNick);
+	KviUserListEntry * e = m_pEntryDict->find(szNick);
 	if(!e)return (kvi_time_t)0;
 	return e->m_joinTime;
 }
 
 kvi_time_t KviUserListView::getUserLastActionTime(const TQString &szNick)
 {
-	KviUserListEntry * e = m_pEntryDict->tqfind(szNick);
+	KviUserListEntry * e = m_pEntryDict->find(szNick);
 	if(!e)return (kvi_time_t)0;
 	return e->m_lastActionTime;
 }
@@ -821,7 +821,7 @@ kvi_time_t KviUserListView::getUserLastActionTime(const TQString &szNick)
 
 int KviUserListView::getUserModeLevel(const TQString &szNick)
 {
-	KviUserListEntry * e = m_pEntryDict->tqfind(szNick);
+	KviUserListEntry * e = m_pEntryDict->find(szNick);
 	if(!e)return 0;
 	if(e->m_iFlags & KVI_USERFLAG_MODEMASK)
 	{
@@ -849,14 +849,14 @@ void KviUserListView::prependUserFlag(const TQString &nick,TQString &buffer)
 
 int KviUserListView::flags(const TQString &nick)
 {
-	KviUserListEntry * it = m_pEntryDict->tqfind(nick);
+	KviUserListEntry * it = m_pEntryDict->find(nick);
 	return it ? it->m_iFlags : 0;
 }
 
 #define SET_FLAG_FUNC(__funcname,__flag) \
 	bool KviUserListView::__funcname(const TQString &nick,bool bYes) \
 	{ \
-		KviUserListEntry * it = m_pEntryDict->tqfind(nick); \
+		KviUserListEntry * it = m_pEntryDict->find(nick); \
 		if(!it)return false; \
 		m_pEntryDict->setAutoDelete(false); \
 		partInternal(nick,false); \
@@ -883,7 +883,7 @@ SET_FLAG_FUNC(voice,KVI_USERFLAG_VOICE)
 #define GET_FLAG_FUNC(__funcname,__flag) \
 	bool KviUserListView::__funcname(const TQString &nick,bool bAtLeast) \
 	{ \
-		KviUserListEntry * it = m_pEntryDict->tqfind(nick); \
+		KviUserListEntry * it = m_pEntryDict->find(nick); \
 		return it ? (bAtLeast ? (it->m_iFlags >= __flag) : (it->m_iFlags & __flag)) : false; \
 	}
 
@@ -950,7 +950,7 @@ void KviUserListView::select(const TQString& nick){
 		++it;
 	}
 
-	KviUserListEntry * entry = m_pEntryDict->tqfind(nick);
+	KviUserListEntry * entry = m_pEntryDict->find(nick);
 	if(entry)
 	{
 		entry->m_bSelected = true;
@@ -964,7 +964,7 @@ void KviUserListView::select(const TQString& nick){
 
 bool KviUserListView::partInternal(const TQString &nick,bool bRemove)
 {
-	KviUserListEntry * it = m_pEntryDict->tqfind(nick);
+	KviUserListEntry * it = m_pEntryDict->find(nick);
 	if(it)
 	{
 		// so, first of all..check if this item is over, or below the top item
@@ -1030,7 +1030,7 @@ bool KviUserListView::partInternal(const TQString &nick,bool bRemove)
 
 bool KviUserListView::nickChange(const TQString &oldNick,const TQString &newNick)
 {
-	KviUserListEntry * it = m_pEntryDict->tqfind(oldNick);
+	KviUserListEntry * it = m_pEntryDict->find(oldNick);
 	if(it)
 	{
 		TQString user      = it->m_pGlobalData->user();
@@ -1042,7 +1042,7 @@ bool KviUserListView::nickChange(const TQString &oldNick,const TQString &newNick
 		KviIrcUserEntry::Gender gender = it->m_pGlobalData->gender();
 		bool bBot = it->m_pGlobalData->isBot();
 		part(oldNick);
-		__range_invalid(m_pEntryDict->tqfind(oldNick));
+		__range_invalid(m_pEntryDict->find(oldNick));
 		it = join(newNick,user,host,iFlags);
 		it->m_pGlobalData->setGender(gender);
 		it->m_pGlobalData->setBot(bBot);
@@ -1829,8 +1829,8 @@ void KviUserListViewArea::keyPressEvent( TQKeyEvent * e )
 			KviUserListEntry * aux = m_pListView->m_pHeadItem;
 			while(aux)
 			{
-				//debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().tqfind(szKey,0,0));
-				if(aux->nick().tqfind(szKey,0,0)==0) 
+				//debug("%s %s %i %s %i",__FILE__,__FUNCTION__,__LINE__,aux->nick().utf8().data(),aux->nick().find(szKey,0,0));
+				if(aux->nick().find(szKey,0,0)==0) 
 				{
 					nick=aux;
 					break;
diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h
index 2098a942..a666d335 100644
--- a/src/kvirc/ui/kvi_userlistview.h
+++ b/src/kvirc/ui/kvi_userlistview.h
@@ -182,7 +182,7 @@ public:
 	int halfOpCount(){ return m_iHalfOpCount; };
 	int userOpCount(){ return m_iUserOpCount; };
 
-	KviUserListEntry * findEntry(const TQString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->tqfind(nick); };
+	KviUserListEntry * findEntry(const TQString &nick){ return nick.isEmpty() ? 0 : m_pEntryDict->find(nick); };
 	void appendSelectedNicknames(TQString &buffer);
 	TQString * firstSelectedNickname();
 	TQString * nextSelectedNickname();
@@ -193,7 +193,7 @@ public:
 	kvi_time_t getUserJoinTime(const TQString &nick);
 	kvi_time_t getUserLastActionTime(const TQString &nick);
 	char getUserFlag(KviUserListEntry * e);
-	char getUserFlag(const TQString &nick){ return getUserFlag(m_pEntryDict->tqfind(nick)); };
+	char getUserFlag(const TQString &nick){ return getUserFlag(m_pEntryDict->find(nick)); };
 	bool part(const TQString &nick){ return partInternal(nick,true); };
 	bool op(const TQString &nick,bool bOp);
 	void prependUserFlag(const TQString &nick,TQString &buffer);
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 763df175..d7f141aa 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -301,7 +301,7 @@ bool KviWindow::focusNextPrevChild(bool next)
 #ifdef COMPILE_USE_QT4
 			if(w->tqparent()->tqmetaObject()->indexOfProperty("KviProperty_ChildFocusOwner") == -1)
 #else
-			if(w->tqparent()->tqmetaObject()->tqfindProperty("KviProperty_ChildFocusOwner") == -1)
+			if(w->tqparent()->tqmetaObject()->findProperty("KviProperty_ChildFocusOwner") == -1)
 #endif
 				return false; // Do NOT change the focus widget!
 		}
@@ -591,7 +591,7 @@ void KviWindow::getDefaultLogFileName(TQString &buffer)
 	TQString base;
 	getBaseLogFileName(base);
 	kvi_encodeFileName(base);
-	base.tqreplace("%%2e","%2e");
+	base.replace("%%2e","%2e");
 	base=base.lower();
 	TQString tmp;
 	if(KVI_OPTION_BOOL(KviOption_boolGzipLogs))
@@ -1239,7 +1239,7 @@ void KviWindow::updateBackgrounds(TQObject * obj)
 		{
 			TQObject * child = list.at(i);
 			// FIXME: check if this code can work with qt < 3.0.0 too
-			if(child->tqmetaObject()->tqfindProperty("TransparencyCapable",true) != -1)
+			if(child->tqmetaObject()->findProperty("TransparencyCapable",true) != -1)
 				((TQWidget *)child)->update();
 
 			updateBackgrounds(child);
@@ -1483,12 +1483,12 @@ void KviWindow::preprocessMessage(TQString & szMessage)
 #endif
 	for ( TQStringList::Iterator it = strings.begin(); it != strings.end(); ++it ) {
 		TQString tmp(*it);
-		if(tmp.tqcontains('\r')) continue;
+		if(tmp.contains('\r')) continue;
 		tmp = KviMircCntrl::stripControlBytes(tmp);
 		tmp.stripWhiteSpace();
 		if(m_pConsole)
 			if(m_pConsole->connection())
-				if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().tqcontains(tmp[0]))
+				if(m_pConsole->connection()->serverInfo()->supportedChannelTypes().contains(tmp[0]))
 					if((*it)==tmp)
 						*it=TQString("\r!c\r%1\r").tqarg(*it);
 					else
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;