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

5 files changed, 39 insertions, 39 deletions

diff --git a/libkdeedu/extdate/extdatetbl.cpp b/libkdeedu/extdate/extdatetbl.cpp
index b2baa47c..ec23d33a 100644
--- a/libkdeedu/extdate/extdatetbl.cpp
+++ b/libkdeedu/extdate/extdatetbl.cpp
@@ -554,7 +554,7 @@ void ExtDateTable::setCustomDatePainting(const ExtDate &date, const TQColor &fgC
     mode->fgColor=fgColor;
     mode->bgColor=bgColor;
 
-    d->customPaintingModes.tqreplace( date.toString(), mode );
+    d->customPaintingModes.replace( date.toString(), mode );
     d->useCustomColors=true;
     update();
 }
diff --git a/libkdeedu/extdate/extdatetime.cpp b/libkdeedu/extdate/extdatetime.cpp
index 2af13595..d8984eee 100644
--- a/libkdeedu/extdate/extdatetime.cpp
+++ b/libkdeedu/extdate/extdatetime.cpp
@@ -293,16 +293,16 @@ TQString ExtDate::toString( const TQString& format ) const
 
 	TQString result( format );
 
-	result.tqreplace( "%Y", TQString().sprintf( "%d", year() ) );
-	result.tqreplace( "%y", TQString().sprintf( "%02d", (year() % 100) ) );
-	result.tqreplace( "%n", TQString().sprintf( "%d", month() ) );
-	result.tqreplace( "%m", TQString().sprintf( "%02d", month() ) );
-	result.tqreplace( "%e", TQString().sprintf( "%d", day() ) );
-	result.tqreplace( "%d", TQString().sprintf( "%02d", day() ) );
-	result.tqreplace( "%b", shortMonthName( month() ) );
-	result.tqreplace( "%B", longMonthName( month() ) );
-	result.tqreplace( "%a", shortDayName( dayOfWeek() ) );
-	result.tqreplace( "%A", longDayName( dayOfWeek() ) );
+	result.replace( "%Y", TQString().sprintf( "%d", year() ) );
+	result.replace( "%y", TQString().sprintf( "%02d", (year() % 100) ) );
+	result.replace( "%n", TQString().sprintf( "%d", month() ) );
+	result.replace( "%m", TQString().sprintf( "%02d", month() ) );
+	result.replace( "%e", TQString().sprintf( "%d", day() ) );
+	result.replace( "%d", TQString().sprintf( "%02d", day() ) );
+	result.replace( "%b", shortMonthName( month() ) );
+	result.replace( "%B", longMonthName( month() ) );
+	result.replace( "%a", shortDayName( dayOfWeek() ) );
+	result.replace( "%A", longDayName( dayOfWeek() ) );
 
 	return result;
 }
@@ -833,13 +833,13 @@ TQString ExtDateTime::toString( const TQString& format ) const
 
 	int h = time().hour();
 
-	result.tqreplace( "%H", TQString().sprintf( "%02d", h ) );
-	result.tqreplace( "%k", TQString().sprintf( "%d", h ) );
-	result.tqreplace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) );
-	result.tqreplace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) );
-	result.tqreplace( "%M", TQString().sprintf( "%02d", time().minute() ) );
-	result.tqreplace( "%S", TQString().sprintf( "%02d", time().second() ) );
-	result.tqreplace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) );
+	result.replace( "%H", TQString().sprintf( "%02d", h ) );
+	result.replace( "%k", TQString().sprintf( "%d", h ) );
+	result.replace( "%I", TQString().sprintf( "%02d", ( h > 12 ) ? h-12 : h ) );
+	result.replace( "%l", TQString().sprintf( "%d", ( h > 12 ) ? h-12 : h ) );
+	result.replace( "%M", TQString().sprintf( "%02d", time().minute() ) );
+	result.replace( "%S", TQString().sprintf( "%02d", time().second() ) );
+	result.replace( "%p", TQString().sprintf( "%s", ( h > 12 ) ? "pm" : "am" ) );
 
 	return result;
 }
@@ -1084,7 +1084,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
 	}
 
 	if ( f == Qt::ISODate ) {
-		if ( s.length() <= 10 || ! s.tqcontains( ':' )  ) { //no time specified
+		if ( s.length() <= 10 || ! s.contains( ':' )  ) { //no time specified
 			TQTime t = TQTime(0,0,0);
 			return ExtDateTime( ExtDate::fromString( s.mid(0,10), Qt::ISODate ) );
 		} else {
@@ -1099,7 +1099,7 @@ ExtDateTime ExtDateTime::fromString( const TQString& s, Qt::DateFormat f )
 		TQTime time;
 		TQString sd = s;
 		int hour, minute, second;
-		int pivot = s.tqfind( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
+		int pivot = s.find( TQRegExp(TQString::tqfromLatin1("[0-9][0-9]:[0-9][0-9]:[0-9][0-9]")) );
 		if ( pivot != -1 ) {
 			hour = s.mid( pivot, 2 ).toInt();
 			minute = s.mid( pivot+3, 2 ).toInt();
diff --git a/libkdeedu/extdate/extdatetimeedit.cpp b/libkdeedu/extdate/extdatetimeedit.cpp
index 78bc371b..61331bc9 100644
--- a/libkdeedu/extdate/extdatetimeedit.cpp
+++ b/libkdeedu/extdate/extdatetimeedit.cpp
@@ -113,9 +113,9 @@ static void readLocaleSettings()
     *lTimeSep = ":";
 #endif
     TQString d = ExtDate( 1999, 11, 22 ).toString( Qt::LocalDate );
-    dpos = d.tqfind( "22" );
-    mpos = d.tqfind( "11" );
-    ypos = d.tqfind( "99" );
+    dpos = d.find( "22" );
+    mpos = d.find( "11" );
+    ypos = d.find( "99" );
     if ( dpos > -1 && mpos > -1 && ypos > -1 ) {
 	// test for DMY, MDY, YMD, YDM
 	if ( dpos < mpos && mpos < ypos ) {
@@ -135,7 +135,7 @@ static void readLocaleSettings()
 
 #ifndef TQ_WS_WIN
 	TQString sep = d.mid( TQMIN( dpos, mpos ) + 2, TQABS( dpos - mpos ) - 2 );
-	if ( d.tqcontains( sep ) == 2 ) {
+	if ( d.contains( sep ) == 2 ) {
 	    *lDateSep = sep;
 	}
 #endif
@@ -143,9 +143,9 @@ static void readLocaleSettings()
 
 #ifndef TQ_WS_WIN
     TQString t = TQTime( 11, 22, 33 ).toString( Qt::LocalDate );
-    dpos = t.tqfind( "11" );
-    mpos = t.tqfind( "22" );
-    ypos = t.tqfind( "33" );
+    dpos = t.find( "11" );
+    mpos = t.find( "22" );
+    ypos = t.find( "33" );
     // We only allow hhmmss
     if ( dpos > -1 && dpos < mpos && mpos < ypos ) {
 	TQString sep = t.mid( dpos + 2, mpos - dpos - 2 );
diff --git a/libkdeedu/kdeeduplot/kplotwidget.h b/libkdeedu/kdeeduplot/kplotwidget.h
index 2545ff83..27bd15a0 100644
--- a/libkdeedu/kdeeduplot/kplotwidget.h
+++ b/libkdeedu/kdeeduplot/kplotwidget.h
@@ -100,7 +100,7 @@ public:
 		*@param i the index of th item to be replaced
 		*@param o pointer to the replacement KPlotObject
 		*/
-	virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.tqreplace( i, o ); }
+	virtual void replaceObject( int i, KPlotObject *o ) { ObjectList.replace( i, o ); }
 
 	/**@return the number of KPlotObjects in the list
 		*/
diff --git a/libkdeedu/kdeeduui/kdeeduglossary.cpp b/libkdeedu/kdeeduui/kdeeduglossary.cpp
index 882b5007..4ab49437 100644
--- a/libkdeedu/kdeeduui/kdeeduglossary.cpp
+++ b/libkdeedu/kdeeduui/kdeeduglossary.cpp
@@ -100,8 +100,8 @@ void Glossary::fixImagePath()
 
 	for ( ; it != itEnd ; ++it )
 	{
-		( *it )->setDesc( ( *it )->desc().tqreplace("[img]", firstpart ) );
-		( *it )->setDesc( ( *it )->desc().tqreplace("[/img]", "\" />" ) );
+		( *it )->setDesc( ( *it )->desc().replace("[img]", firstpart ) );
+		( *it )->setDesc( ( *it )->desc().replace("[/img]", "\" />" ) );
 	}
 }
 	
@@ -136,15 +136,15 @@ TQValueList<GlossaryItem*> Glossary::readItems( TQDomDocument &itemDocument )
 
 		item->setName( i18n( nameNode.toElement( ).text().utf8() ) );
 		
-		item->setDesc( desc.tqreplace("[b]", "<b>" ) );
-		item->setDesc( item->desc().tqreplace("[/b]", "</b>" ) );
-		item->setDesc( item->desc().tqreplace("[i]", "<i>" ) );
-		item->setDesc( item->desc().tqreplace("[/i]", "</i>" ) );
-		item->setDesc( item->desc().tqreplace("[sub]", "<sub>" ) );
-		item->setDesc( item->desc().tqreplace("[/sub]", "</sub>" ) );
-		item->setDesc( item->desc().tqreplace("[sup]", "<sup>" ) );
-		item->setDesc( item->desc().tqreplace("[/sup]", "</sup>" ) );
-		item->setDesc( item->desc().tqreplace("[br]", "<br />" ) );
+		item->setDesc( desc.replace("[b]", "<b>" ) );
+		item->setDesc( item->desc().replace("[/b]", "</b>" ) );
+		item->setDesc( item->desc().replace("[i]", "<i>" ) );
+		item->setDesc( item->desc().replace("[/i]", "</i>" ) );
+		item->setDesc( item->desc().replace("[sub]", "<sub>" ) );
+		item->setDesc( item->desc().replace("[/sub]", "</sub>" ) );
+		item->setDesc( item->desc().replace("[sup]", "<sup>" ) );
+		item->setDesc( item->desc().replace("[/sup]", "</sup>" ) );
+		item->setDesc( item->desc().replace("[br]", "<br />" ) );
 		
 		refNodeList = refNode.elementsByTagName( "refitem" );
 		for ( uint it = 0; it < refNodeList.count(); it++ )