rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/note.cpp b/src/note.cpp
index 12ff890..5c07de4 100644
--- a/src/note.cpp
+++ b/src/note.cpp
@@ -445,7 +445,7 @@ bool Note::isAfter(Note *note)
 	return true;
 }
 
-bool Note::tqcontains(Note *note)
+bool Note::contains(Note *note)
 {
 //	if (this == note)
 //		return true;
@@ -457,7 +457,7 @@ bool Note::tqcontains(Note *note)
 			note = note->parentNote();
 
 //	FOR_EACH_CHILD (child)
-//		if (child->tqcontains(note))
+//		if (child->contains(note))
 //			return true;
 	return false;
 }
@@ -959,7 +959,7 @@ void Note::toggleFolded(bool animate)
 {
 	// Close the editor if it was editing a note that we are about to hide after collapsing:
 	if (!m_isFolded && basket() && basket()->isDuringEdit()) {
-		if (tqcontains(basket()->editedNote()) && firstRealChild() != basket()->editedNote())
+		if (contains(basket()->editedNote()) && firstRealChild() != basket()->editedNote())
 			basket()->closeEditor();
 	}
 
@@ -1031,7 +1031,7 @@ Note* Note::noteAt(int x, int y)
 				recomputeAreas();
 			for (TQValueList<TQRect>::iterator it = m_areas.begin(); it != m_areas.end(); ++it) {
 				TQRect &rect = *it;
-				if (rect.tqcontains(x, y))
+				if (rect.contains(x, y))
 					return this;
 			}
 		}
@@ -1043,7 +1043,7 @@ Note* Note::noteAt(int x, int y)
 				recomputeAreas();
 			for (TQValueList<TQRect>::iterator it = m_areas.begin(); it != m_areas.end(); ++it) {
 				TQRect &rect = *it;
-				if (rect.tqcontains(x, y))
+				if (rect.contains(x, y))
 					return this;
 			}
 			return NULL;
@@ -1065,7 +1065,7 @@ Note* Note::noteAt(int x, int y)
 			recomputeAreas();
 		for (TQValueList<TQRect>::iterator it = m_areas.begin(); it != m_areas.end(); ++it) {
 			TQRect &rect = *it;
-			if (rect.tqcontains(x, y))
+			if (rect.contains(x, y))
 				return this;
 		}
 		return NULL;
@@ -1667,7 +1667,7 @@ void substractRectOnAreas(const TQRect &rectToSubstract, TQValueList<TQRect> &ar
 				rect.setRight(rectToSubstract.right());
 			}
 			// Remove the rectangle if it's entirely contained:
-			if (andRemove && rectToSubstract.tqcontains(rect))
+			if (andRemove && rectToSubstract.contains(rect))
 				it = areas.remove(it);
 			else
 				++it;
@@ -2181,7 +2181,7 @@ bool Note::removedStates(const TQValueList<State*> &deletedStates)
 
 void Note::addTag(Tag *tag)
 {
-	addState(tag->states().first(), /*but do not tqreplace:*/false);
+	addState(tag->states().first(), /*but do not replace:*/false);
 }
 
 void Note::removeState(State *state)
@@ -2454,7 +2454,7 @@ void Note::listUsedTags(TQValueList<Tag*> &list)
 {
 	for (State::List::Iterator it = m_states.begin(); it != m_states.end(); ++it) {
 		Tag *tag = (*it)->parentTag();
-		if (!list.tqcontains(tag))
+		if (!list.contains(tag))
 			list.append(tag);
 	}
 
@@ -2467,7 +2467,7 @@ void Note::usedStates(TQValueList<State*> &states)
 {
 	if (content())
 		for (State::List::Iterator it = m_states.begin(); it != m_states.end(); ++it)
-			if (!states.tqcontains(*it))
+			if (!states.contains(*it))
 				states.append(*it);
 
 	FOR_EACH_CHILD (child)