rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

9 files changed, 24 insertions, 24 deletions

diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index 4efb6d7b..24cd08e8 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -335,7 +335,7 @@ void KEXI_UNFINISHED(const TQString& feature_name, const TQString& extra_text)
 	else {
 		TQString feature_name_(feature_name);
 		msg = i18n("\"%1\" function is not available for version %2 of %3 application.")
-			.tqarg(feature_name_.tqreplace("&",""))
+			.tqarg(feature_name_.replace("&",""))
 			.tqarg(KEXI_VERSION_STRING)
 			.tqarg(KEXI_APP_NAME);
 	}
diff --git a/kexi/core/kexiactioncategories.cpp b/kexi/core/kexiactioncategories.cpp
index b3cd1c06..03c09433 100644
--- a/kexi/core/kexiactioncategories.cpp
+++ b/kexi/core/kexiactioncategories.cpp
@@ -89,7 +89,7 @@ void ActionCategories::addAction(const char* name, int categories,
 	KexiPart::ObjectTypes supportedObjectType5, KexiPart::ObjectTypes supportedObjectType6,
 	KexiPart::ObjectTypes supportedObjectType7, KexiPart::ObjectTypes supportedObjectType8)
 {
-	ActionInternal * a = d->actions.tqfind( name );
+	ActionInternal * a = d->actions.find( name );
 	if (a) {
 		a->categories |= categories;
 	}
@@ -127,7 +127,7 @@ void ActionCategories::addAction(const char* name, int categories,
 
 void ActionCategories::setAllObjectTypesSupported(const char* name, bool set)
 {
-	ActionInternal * a = d->actions.tqfind( name );
+	ActionInternal * a = d->actions.find( name );
 	if (a)
 		a->allObjectTypesAreSupported = set;
 	else
@@ -136,14 +136,14 @@ void ActionCategories::setAllObjectTypesSupported(const char* name, bool set)
 
 int ActionCategories::actionCategories(const char* name) const
 {
-	const ActionInternal * a = d->actions.tqfind( name );
+	const ActionInternal * a = d->actions.find( name );
 	return a ? a->categories : 0;
 }
 
 bool ActionCategories::actionSupportsObjectType(const char* name, KexiPart::ObjectTypes objectType) const
 {
-	const ActionInternal * a = d->actions.tqfind( name );
+	const ActionInternal * a = d->actions.find( name );
 	if (a && a->allObjectTypesAreSupported)
 		return true;
-	return (a && a->supportedObjectTypes) ? a->supportedObjectTypes->tqcontains(objectType) : false;
+	return (a && a->supportedObjectTypes) ? a->supportedObjectTypes->contains(objectType) : false;
 }
diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp
index 7f5f42f9..4b77b9ef 100644
--- a/kexi/core/kexiactionproxy.cpp
+++ b/kexi/core/kexiactionproxy.cpp
@@ -269,7 +269,7 @@ void KexiActionProxy::addActionProxyChild( KexiActionProxy* child )
 
 void KexiActionProxy::takeActionProxyChild( KexiActionProxy* child )
 {
-	if (m_sharedActionChildren.tqfindRef( child ) != -1)
+	if (m_sharedActionChildren.findRef( child ) != -1)
 		m_sharedActionChildren.take();
 }
 
diff --git a/kexi/core/kexiblobbuffer.cpp b/kexi/core/kexiblobbuffer.cpp
index d1f78c4a..a4c57791 100644
--- a/kexi/core/kexiblobbuffer.cpp
+++ b/kexi/core/kexiblobbuffer.cpp
@@ -193,7 +193,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::insertPixmap(const KURL& url)
 		return KexiBLOBBuffer::Handle();
 	}
 //! @todo what about searching by filename only and then compare data?
-	Item * item = d->itemsByURL.tqfind(url.prettyURL());
+	Item * item = d->itemsByURL.find(url.prettyURL());
 	if (item)
 		return KexiBLOBBuffer::Handle(item);
 
@@ -212,14 +212,14 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::insertPixmap(const KURL& url)
 		return KexiBLOBBuffer::Handle();
 	}
 	TQFileInfo fi(url.fileName());
-	TQString caption(fi.baseName().tqreplace('_', " ").simplifyWhiteSpace());
+	TQString caption(fi.baseName().replace('_', " ").simplifyWhiteSpace());
 
 	item = new Item(data, ++d->maxId, /*!stored*/false, url.fileName(), caption, mimeType);
 	insertItem(item);
 
 	//cache
 	item->prettyURL = url.prettyURL();
-	d->itemsByURL.tqreplace(url.prettyURL(), item);
+	d->itemsByURL.replace(url.prettyURL(), item);
 	return KexiBLOBBuffer::Handle(item);
 }
 
@@ -261,7 +261,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored)
 	if (id<=0)
 		return KexiBLOBBuffer::Handle();
 	if (stored) {
-		Item *item = d->storedItems.tqfind(id);
+		Item *item = d->storedItems.find(id);
 		if (item || !d->conn)
 			return KexiBLOBBuffer::Handle(item);
 		//retrieve stored BLOB:
@@ -314,7 +314,7 @@ KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id, bool stored)
 //#endif
 	}
 	else
-		return KexiBLOBBuffer::Handle(d->inMemoryItems.tqfind(id));
+		return KexiBLOBBuffer::Handle(d->inMemoryItems.find(id));
 }
 
 KexiBLOBBuffer::Handle KexiBLOBBuffer::objectForId(Id_t id)
diff --git a/kexi/core/kexidbconnectionset.cpp b/kexi/core/kexidbconnectionset.cpp
index f548d82b..d76ed3f4 100644
--- a/kexi/core/kexidbconnectionset.cpp
+++ b/kexi/core/kexidbconnectionset.cpp
@@ -101,7 +101,7 @@ bool KexiDBConnectionSet::saveConnectionData(KexiDB::ConnectionData *oldData,
 {
 	if (!oldData || !newData)
 		return false;
-	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( oldData );
+	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( oldData );
 	if (it == d->filenamesForData.constEnd() || it.data().isEmpty())
 		return false;
 	const TQString filename( it.data() );
@@ -115,7 +115,7 @@ bool KexiDBConnectionSet::saveConnectionData(KexiDB::ConnectionData *oldData,
 
 void KexiDBConnectionSet::removeConnectionDataInternal(KexiDB::ConnectionData *data)
 {
-	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data );
+	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data );
 	const TQString filename( it.data() );
 	d->filenamesForData.remove(data);
 	d->dataForFilenames.remove(filename);
@@ -126,7 +126,7 @@ bool KexiDBConnectionSet::removeConnectionData(KexiDB::ConnectionData *data)
 {
 	if (!data)
 		return false;
-	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data );
+	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data );
 	if (it == d->filenamesForData.constEnd() || it.data().isEmpty())
 		return false;
 	TQFile file( it.data() );
@@ -173,7 +173,7 @@ TQString KexiDBConnectionSet::fileNameForConnectionData(KexiDB::ConnectionData *
 {
 	if (!data)
 		return TQString();
-	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.tqfind( data );
+	TQMap<KexiDB::ConnectionData*, TQString>::ConstIterator it = d->filenamesForData.find( data );
 	return (it == d->filenamesForData.constEnd()) ? TQString() : it.data();
 }
 
diff --git a/kexi/core/kexipartmanager.cpp b/kexi/core/kexipartmanager.cpp
index 8cd8fc0e..00575461 100644
--- a/kexi/core/kexipartmanager.cpp
+++ b/kexi/core/kexipartmanager.cpp
@@ -81,7 +81,7 @@ Manager::lookup()
 		if (!Kexi::tempShowScripts() && mime=="kexi/script")
 			continue;
 //</TEMP>
-		int idx = sl_order.tqfindIndex( ptr->library() );
+		int idx = sl_order.findIndex( ptr->library() );
 		if (idx!=-1)
 			ordered.insert(idx, ptr);
 		else //add to end
@@ -254,11 +254,11 @@ Manager::checkProject(KexiDB::Connection *conn)
 	KexiDB::FieldList *fl = ts->subList("p_id", "p_name", "p_mime", "p_url");
 	if (!fl)
 		return false;
-	if (!parts_found.tqcontains("kexi/table")) {
+	if (!parts_found.contains("kexi/table")) {
 		if (!conn->insertRecord(*fl, TQVariant(1), TQVariant("Tables"), TQVariant("kexi/table"), TQVariant("http://")))
 			return false;
 	}
-	if (!parts_found.tqcontains("kexi/query")) {
+	if (!parts_found.contains("kexi/query")) {
 		if (!conn->insertRecord(*fl, TQVariant(2), TQVariant("Queries"), TQVariant("kexi/query"), TQVariant("http://")))
 			return false;
 	}
diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp
index 7a2d9367..159de750 100644
--- a/kexi/core/kexiproject.cpp
+++ b/kexi/core/kexiproject.cpp
@@ -664,7 +664,7 @@ KexiProject::item(int identifier)
 {
 	KexiPart::ItemDict *dict;
 	for (TQIntDictIterator<KexiPart::ItemDict> it(d->itemDictsCache); (dict = it.current()); ++it) {
-		KexiPart::Item *item = dict->tqfind(identifier);
+		KexiPart::Item *item = dict->find(identifier);
 		if (item)
 			return item;
 	}
diff --git a/kexi/core/kexisearchandreplaceiface.h b/kexi/core/kexisearchandreplaceiface.h
index f581de34..0101c7ce 100644
--- a/kexi/core/kexisearchandreplaceiface.h
+++ b/kexi/core/kexisearchandreplaceiface.h
@@ -78,10 +78,10 @@ class KEXICORE_EXPORT KexiSearchAndReplaceViewInterface
 				bool promptOnReplace : 1;
 		};
 
-		/*! Sets up data for tqfind/replace dialog, based on view's data model.
+		/*! Sets up data for find/replace dialog, based on view's data model.
 		 \a columnNames should contain column name, \a columnCaptions should contain column captions,
 		 and \a currentColumnName should beset to current column's name.
-		 Implementation should set up values and return true if tqfind/replace dialog should be filled. */
+		 Implementation should set up values and return true if find/replace dialog should be filled. */
 		virtual bool setupFindAndReplace(TQStringList& columnNames, TQStringList& columnCaptions,
 			TQString& currentColumnName) = 0;
 
@@ -90,7 +90,7 @@ class KEXICORE_EXPORT KexiSearchAndReplaceViewInterface
 		 \return true if value has been found, false if value has not been found,
 		 and cancelled if there is nothing to find or there is no data to search in. 
 		 If \a next is true, "find next" is performed, else "find previous" is performed. */
-		virtual tristate tqfind(const TQVariant& valueToFind, 
+		virtual tristate find(const TQVariant& valueToFind, 
 			const KexiSearchAndReplaceViewInterface::Options& options, bool next) = 0;
 
 		/*! Finds \a valueToFind within the view and replaces with \a replacement
diff --git a/kexi/core/kexisharedactionhost.cpp b/kexi/core/kexisharedactionhost.cpp
index a98ac5a6..aabba3e2 100644
--- a/kexi/core/kexisharedactionhost.cpp
+++ b/kexi/core/kexisharedactionhost.cpp
@@ -119,7 +119,7 @@ void KexiSharedActionHost::updateActionAvailable(const char *action_name, bool a
 
 	setActionAvailable(action_name, avail);
 	if (avail) {
-		d->enablers.tqreplace(action_name, fw);
+		d->enablers.replace(action_name, fw);
 	}
 	else {
 		d->enablers.take(action_name);