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

36 files changed, 240 insertions, 240 deletions

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) )  {