rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 10 insertions, 10 deletions

diff --git a/noatun/library/playlist.cpp b/noatun/library/playlist.cpp
index a86be118..33e5c1f0 100644
--- a/noatun/library/playlist.cpp
+++ b/noatun/library/playlist.cpp
@@ -62,12 +62,12 @@ TQString PlaylistItemData::title() const
 	// "$(property)"
 	TQString format=napp->titleFormat();
 
-	TQRegExp tqfind("(?:(?:\\\\\\\\))*\\$\\((.*)");
+	TQRegExp find("(?:(?:\\\\\\\\))*\\$\\((.*)");
 
 	int start=0;
 	while (start != -1)
 	{
-		start = tqfind.search(format, start);
+		start = find.search(format, start);
 		if (start == -1) break;
 
 		// test if there's an odd amount of backslashes
@@ -81,8 +81,8 @@ TQString PlaylistItemData::title() const
 			uint len=counter.cap(1).length()-1;
 
 			// and half them, and remove one more
-			format.tqreplace(start-1, len/2+1, "");
-			start=start-1+len/2+tqfind.cap(1).length()+3;
+			format.replace(start-1, len/2+1, "");
+			start=start-1+len/2+find.cap(1).length()+3;
 			continue;
 		}
 
@@ -96,12 +96,12 @@ TQString PlaylistItemData::title() const
 			uint len=counter.cap(1).length();
 
 			// and half them
-			format.tqreplace(start, len/2, "");
+			format.replace(start, len/2, "");
 			start=start+len/2;
 		}
 
 		// "sth"foo"sth"
-		TQString cont(tqfind.cap(1));
+		TQString cont(find.cap(1));
 		TQString prefix,suffix,propname;
 		unsigned int i=0;
 		if (cont[i] == '"')
@@ -150,18 +150,18 @@ TQString PlaylistItemData::title() const
 		{
 			// comments can contain newlines
 			// these are not wanted in a formatted title
-			propval.tqreplace('\n', ' ');
+			propval.replace('\n', ' ');
 		}
 
 		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;
@@ -356,7 +356,7 @@ TQValueList<PlaylistItem> Playlist::select(
 				}
 				else
 				{
-					if ((*val).tqfind(v, 0, caseSensitive)!=-1)
+					if ((*val).find(v, 0, caseSensitive)!=-1)
 					{
 						list.append(i);
 						limit--;