rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

9 files changed, 37 insertions, 37 deletions

diff --git a/noatun-plugins/oblique/base.cpp b/noatun-plugins/oblique/base.cpp
index 6288f20..3cb5633 100644
--- a/noatun-plugins/oblique/base.cpp
+++ b/noatun-plugins/oblique/base.cpp
@@ -133,7 +133,7 @@ File Base::add(const TQString &file)
 	return File();
 }
 
-File Base::tqfind(FileId id)
+File Base::find(FileId id)
 {
 	if (id == 0) return File();
 
@@ -155,7 +155,7 @@ void Base::clear()
 {
 	for (FileId id = high(); id >= 1; id--)
 	{
-		File f = tqfind(id);
+		File f = find(id);
 		if (f)
 			f.remove();
 	}
@@ -171,7 +171,7 @@ File Base::first(FileId first)
 {
 	if (first > high()) return File();
 
-	while (!tqfind(first))
+	while (!find(first))
 	{
 		++first;
 		if (first > high())
@@ -183,8 +183,8 @@ File Base::first(FileId first)
 TQString Base::property(FileId id, const TQString &property) const
 {
 	loadIntoCache(id);
-	if (!d->cachedProperties.tqcontains(property)) return TQString();
-	TQMap<TQString,TQString>::Iterator i = d->cachedProperties.tqfind(property);
+	if (!d->cachedProperties.contains(property)) return TQString();
+	TQMap<TQString,TQString>::Iterator i = d->cachedProperties.find(property);
 	return i.data();
 }
 
diff --git a/noatun-plugins/oblique/base.h b/noatun-plugins/oblique/base.h
index 948ec78..4652343 100644
--- a/noatun-plugins/oblique/base.h
+++ b/noatun-plugins/oblique/base.h
@@ -32,7 +32,7 @@ public:
 
 	File add(const TQString &file);
 
-	File tqfind(FileId id);
+	File find(FileId id);
 
 	void clear();
 
@@ -96,7 +96,7 @@ private: // friends for Slice
 
 private:
 	/**
-	 * load the xml that lives at the head of the db and tqcontains
+	 * load the xml that lives at the head of the db and contains
 	 * potentially lots of structured data
 	 **/
 	void loadMetaXML(const TQString &xml);
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 5df19b0..d97c21f 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -272,7 +272,7 @@ void SchemaConfig::save()
 TQString SchemaConfig::nameToFilename(const TQString &_name)
 {
 	TQString name = _name;
-	name = name.tqreplace(TQRegExp("[^a-zA-Z0-9]"), "_");
+	name = name.replace(TQRegExp("[^a-zA-Z0-9]"), "_");
 	return name;
 }
 
@@ -288,7 +288,7 @@ void SchemaConfig::newSchema()
 
 	TQString filename = nameToFilename(str);
 
-	if (mQueries.tqcontains(nameToFilename(filename))) return;
+	if (mQueries.contains(nameToFilename(filename))) return;
 
 	QueryItem queryitem;
 	queryitem.query = Query();
@@ -312,7 +312,7 @@ void SchemaConfig::copySchema()
 
 	TQString filename = nameToFilename(str);
 
-	if (mQueries.tqcontains(nameToFilename(filename))) return;
+	if (mQueries.contains(nameToFilename(filename))) return;
 
 	QueryItem queryitem;
 	queryitem.query = currentQuery()->query;
@@ -621,7 +621,7 @@ void SliceConfig::addSibling()
 void SliceConfig::removeSelf()
 {
 	SliceListItem *r = currentItem();
-	if (mAddedItems.tqcontains(r))
+	if (mAddedItems.contains(r))
 	{
 		mAddedItems.remove(r);
 	}
diff --git a/noatun-plugins/oblique/kdatacollection.cpp b/noatun-plugins/oblique/kdatacollection.cpp
index fc92093..aacb765 100644
--- a/noatun-plugins/oblique/kdatacollection.cpp
+++ b/noatun-plugins/oblique/kdatacollection.cpp
@@ -85,7 +85,7 @@ TQStringList KDataCollection::names() const
 	{
 		TQFileInfo fi(*i);
 		TQString name = fi.fileName();
-		if (!n.tqcontains(name))
+		if (!n.contains(name))
 		{
 			total.append(name);
 		}
@@ -108,7 +108,7 @@ void KDataCollection::remove(const TQString &name)
 	}
 
 	TQStringList n = g.readListEntry(mEntry);
-	if (n.tqcontains(name)) return;
+	if (n.contains(name)) return;
 	n.append(name);
 	g.writeEntry(mEntry, n);
 }
diff --git a/noatun-plugins/oblique/oblique.cpp b/noatun-plugins/oblique/oblique.cpp
index e297e2b..234833a 100644
--- a/noatun-plugins/oblique/oblique.cpp
+++ b/noatun-plugins/oblique/oblique.cpp
@@ -215,7 +215,7 @@ void Loader::loadItemsDeferred()
 			return;
 		}
 
-		File f = mBase->tqfind(mDeferredLoaderAt);
+		File f = mBase->find(mDeferredLoaderAt);
 
 		if (f)
 		{
diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp
index 0727ca6..dd73d66 100644
--- a/noatun-plugins/oblique/query.cpp
+++ b/noatun-plugins/oblique/query.cpp
@@ -171,7 +171,7 @@ TQString QueryGroup::presentation(const File &file) const
 			uint len=counter.cap(1).length()-1;
 
 			// and half them, and remove one more
-			format.tqreplace(start-1, len/2+1, "");
+			format.replace(start-1, len/2+1, "");
 			start=start-1+len/2+find.cap(1).length()+3;
 			continue;
 		}
@@ -186,7 +186,7 @@ TQString QueryGroup::presentation(const File &file) const
 			uint len=counter.cap(1).length();
 
 			// and half them
-			format.tqreplace(start, len/2, "");
+			format.replace(start, len/2, "");
 			start=start+len/2;
 		}
 
@@ -250,12 +250,12 @@ TQString QueryGroup::presentation(const File &file) const
 		if (propval.length())
 		{
 			propval = prefix+propval+suffix;
-			format.tqreplace(start, i+2, propval);
+			format.replace(start, i+2, propval);
 			start += propval.length();
 		}
 		else
 		{
-			format.tqreplace(start, i+2, "");
+			format.replace(start, i+2, "");
 		}
 	}
 	return format;
@@ -383,7 +383,7 @@ void Query::save(const TQString &name, const TQString &filename)
 	// scourge elimination
 	TQString data = doc.toString();
 	TQString old = data;
-	while (data.tqreplace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
+	while (data.replace(TQRegExp("([\n\r]+)(\t*) "), "\\1\\2\t") != old)
 	{
 		old = data;
 	}
diff --git a/noatun-plugins/oblique/selector.cpp b/noatun-plugins/oblique/selector.cpp
index 004cf91..f28c333 100644
--- a/noatun-plugins/oblique/selector.cpp
+++ b/noatun-plugins/oblique/selector.cpp
@@ -129,7 +129,7 @@ Item *SequentialSelector::current()
 
 void SequentialSelector::setCurrent(const Item &item)
 {
-	TreeItem *current = mTree->tqfind(item.itemFile());
+	TreeItem *current = mTree->find(item.itemFile());
 	setCurrent(current);
 }
 
@@ -210,7 +210,7 @@ Item *RandomSelector::current()
 
 void RandomSelector::setCurrent(const Item &item)
 {
-	setCurrent(mTree->tqfind(item.itemFile()), 0);
+	setCurrent(mTree->find(item.itemFile()), 0);
 }
 
 void RandomSelector::setCurrent(TreeItem *item, TreeItem *previous)
diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp
index a8aaf67..fdf210e 100644
--- a/noatun-plugins/oblique/tree.cpp
+++ b/noatun-plugins/oblique/tree.cpp
@@ -258,14 +258,14 @@ TQString TreeItem::presentation() const
 	return text(0);
 }
 
-TreeItem *TreeItem::tqfind(File item)
+TreeItem *TreeItem::find(File item)
 {
 	TreeItem *i = firstChild();
 	while (i)
 	{
 		if (i->file() == item) return i;
 
-		TreeItem *found = i->tqfind(item);
+		TreeItem *found = i->find(item);
 		if (found and found->playable()) return found;
 		i = i->nextSibling();
 	}
@@ -352,7 +352,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
 	{
 		if (match.length())
 		{
-			if (!text(0).tqcontains(match, false))
+			if (!text(0).contains(match, false))
 			{
 				setHidden(true);
 				return false;
@@ -367,7 +367,7 @@ bool TreeItem::hideIfNoMatch(const TQString &match)
 
 		if (match.length())
 		{
-			visible = text(0).tqcontains(match, false);
+			visible = text(0).contains(match, false);
 		}
 
 		if (visible)
@@ -535,7 +535,7 @@ void Tree::dropped(TQPtrList<TQListViewItem> &items, TQPtrList<TQListViewItem> &
 TreeItem *Tree::firstChild()
 	{ return static_cast<TreeItem*>(KListView::firstChild()); }
 
-TreeItem *Tree::tqfind(File item)
+TreeItem *Tree::find(File item)
 {
 	TreeItem *i = firstChild();
 
@@ -543,7 +543,7 @@ TreeItem *Tree::tqfind(File item)
 	{
 		if (i->file() == item) return i;
 
-		TreeItem *found = i->tqfind(item);
+		TreeItem *found = i->find(item);
 		if (found) return found;
 
 		i = i->nextSibling();
@@ -551,19 +551,19 @@ TreeItem *Tree::tqfind(File item)
 	return i;
 }
 
-void Tree::insert(TreeItem *tqreplace, File file)
+void Tree::insert(TreeItem *replace, File file)
 {
-	TreeItem *created = collate(tqreplace, file);
-	if (mCurrent == tqreplace)
+	TreeItem *created = collate(replace, file);
+	if (mCurrent == replace)
 	{
 		mCurrent = created;
 		repaintItem(created);
-		if (isSelected(tqreplace))
+		if (isSelected(replace))
 			setSelected(created, true);
 	}
-	if (created != tqreplace)
+	if (created != replace)
 	{
-		delete tqreplace;
+		delete replace;
 	}
 }
 
@@ -592,7 +592,7 @@ void Tree::checkRemove(Slice *slice, File f)
 
 void Tree::update(File file)
 {
-	if (TreeItem *item = tqfind(file))
+	if (TreeItem *item = find(file))
 	{
 		insert(item, file);
 	}
diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h
index af14f95..bdc557d 100644
--- a/noatun-plugins/oblique/tree.h
+++ b/noatun-plugins/oblique/tree.h
@@ -45,7 +45,7 @@ public:
 
 	void setOpen(bool o);
 
-	TreeItem *tqfind(File item);
+	TreeItem *find(File item);
 
 	bool playable() const;
 
@@ -107,7 +107,7 @@ public:
 	Tree(Oblique *oblique, TQWidget *tqparent=0);
 	~Tree();
 	TreeItem *firstChild();
-	TreeItem *tqfind(File item);
+	TreeItem *find(File item);
 	TreeItem *current() { return mCurrent; }
 	Query *query() { return &mQuery; }
 	Oblique *oblique() { return mOblique; }
@@ -133,7 +133,7 @@ protected:
 	void movableDropEvent(TQListViewItem* tqparent, TQListViewItem* afterme);
 
 public slots:
-	void insert(TreeItem *tqreplace, File file);
+	void insert(TreeItem *replace, File file);
 	void insert(File file);
 	void remove(File file);
 	void update(File file);