From d8762de95349dc6edaa34db9bf699b367c1af6b1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Aug 2011 06:08:18 +0000
Subject: rename the following methods: tqfind find tqreplace replace
 tqcontains contains

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kgeography/src/askwidget.cpp | 2 +-
 kgeography/src/boxasker.cpp  | 2 +-
 kgeography/src/map.cpp       | 6 +++---
 kgeography/src/mapparser.cpp | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kgeography')

diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp
index cd0d07a4..3a5fade6 100644
--- a/kgeography/src/askwidget.cpp
+++ b/kgeography/src/askwidget.cpp
@@ -72,7 +72,7 @@ void askWidget::nextQuestion()
 	if (p_asked.count() < p_count)
 	{
 		aux = p_map -> getRandomDivision(isClickOnDivision());
-		while (p_asked.tqfind(aux) != p_asked.end()) aux = p_map -> getRandomDivision(isClickOnDivision());
+		while (p_asked.find(aux) != p_asked.end()) aux = p_map -> getRandomDivision(isClickOnDivision());
 		p_asked << aux;
 		nextQuestionHook(aux);
 	}
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index 5774ba10..d263e1f0 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -80,7 +80,7 @@ void boxAsker::nextQuestionHook(const TQString &division)
 	{
 		// false because boxaskers never are clickOnDivision
 		otherDivision = p_map -> getRandomDivision(false);
-		while (auxList.tqfind(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false);
+		while (auxList.find(otherDivision) != auxList.end()) otherDivision = p_map -> getRandomDivision(false);
 		if (i == p_position) i++;
 		if (i < 4 && nextBoxAskerQuestionHook(otherDivision, i, false)) i++;
 		auxList << otherDivision;
diff --git a/kgeography/src/map.cpp b/kgeography/src/map.cpp
index 57d79e9b..0ab2b85b 100644
--- a/kgeography/src/map.cpp
+++ b/kgeography/src/map.cpp
@@ -39,8 +39,8 @@ KGmap::~KGmap()
 bool KGmap::addDivision(division *c)
 {
 	bool b;
-	if (p_nameMap.tqfind(c -> getName()) == p_nameMap.end() && 
-		p_colorMap.tqfind(c -> getRGB()) == p_colorMap.end())
+	if (p_nameMap.find(c -> getName()) == p_nameMap.end() && 
+		p_colorMap.find(c -> getRGB()) == p_colorMap.end())
 	{
 		p_colorMap.insert(c -> getRGB(), c);
 		p_nameMap.insert(c -> getName(), c);
@@ -129,7 +129,7 @@ TQString KGmap::getWhatIs(TQRgb c, bool all) const
 {
 	// this is only asked from mapasker.cpp hence the true in canAsk
 	TQMap<TQRgb, division*>::const_iterator it;
-	it = p_colorMap.tqfind(c);
+	it = p_colorMap.find(c);
 	if (it == p_colorMap.end()) return "nothing";
 	else
 	{
diff --git a/kgeography/src/mapparser.cpp b/kgeography/src/mapparser.cpp
index bf04f0dc..40a1c59e 100644
--- a/kgeography/src/mapparser.cpp
+++ b/kgeography/src/mapparser.cpp
@@ -25,7 +25,7 @@ bool mapReader::parseMap(const TQString &path)
 	TQString aux;
 	p_map = new KGmap();
 	p_map -> setFile(path);
-	aux = path.left(path.tqfindRev('/') + 1); // aux = path but without the file name
+	aux = path.left(path.findRev('/') + 1); // aux = path but without the file name
 	mapParser handler(p_map, aux);
 	TQFile xmlFile(path);
 	if (xmlFile.exists())
@@ -270,10 +270,10 @@ TQString mapParser::errorString()
 
 TQString mapParser::getPreviousTag() const
 {
-	return p_previousTags.right(p_previousTags.length() - p_previousTags.tqfindRev(':') - 1);
+	return p_previousTags.right(p_previousTags.length() - p_previousTags.findRev(':') - 1);
 }
 
 void mapParser::removeLastTag()
 {
-	p_previousTags = p_previousTags.left(p_previousTags.tqfindRev(':'));
+	p_previousTags = p_previousTags.left(p_previousTags.findRev(':'));
 }
-- 
cgit v1.2.1