rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 13 insertions, 13 deletions

diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp
index b61738ae..e86f08b7 100644
--- a/kopete/plugins/history/historydialog.cpp
+++ b/kopete/plugins/history/historydialog.cpp
@@ -125,7 +125,7 @@ HistoryDialog::HistoryDialog(Kopete::MetaContact *mc, TQWidget* tqparent,
 	}
 
 	if (mMetaContact)
-		mMainWidget->contactComboBox->setCurrentItem(mMetaContactList.tqfind(mMetaContact)+1);
+		mMainWidget->contactComboBox->setCurrentItem(mMetaContactList.find(mMetaContact)+1);
 
 	mMainWidget->dateSearchLine->setListView(mMainWidget->dateListView);
 	mMainWidget->dateListView->setSorting(0, 0); //newest-first
@@ -231,7 +231,7 @@ void HistoryDialog::slotLoadDays()
 		for (unsigned int i=0; i<dayList.count(); i++)
 		{
 				TQDate c2Date(pair.date().year(),pair.date().month(),dayList[i]);
-				if (mInit.dateMCList.tqfind(pair) == mInit.dateMCList.end())
+				if (mInit.dateMCList.find(pair) == mInit.dateMCList.end())
 						new KListViewDateItem(mMainWidget->dateListView, c2Date, pair.metaContact());
 		}
 		mMainWidget->searchProgress->advance(1);
@@ -255,13 +255,13 @@ void HistoryDialog::init(Kopete::Contact *c)
 {
 	// Get year and month list
 	TQRegExp rx( "\\.(\\d\\d\\d\\d)(\\d\\d)" );
-	const TQString contact_in_filename=c->contactId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) );
+	const TQString contact_in_filename=c->contactId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) );
 	TQFileInfo *fi;
 	
 
 	// BEGIN check if there are Kopete 0.7.x
 	TQDir d1(locateLocal("data",TQString("kopete/logs/")+
-			c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-"))
+			c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-"))
 					   ));
 	d1.setFilter( TQDir::Files | TQDir::NoSymLinks );
 	d1.setSorting( TQDir::Name );
@@ -272,7 +272,7 @@ void HistoryDialog::init(Kopete::Contact *c)
 		TQFileInfoListIterator it1( *list1 );
 		while ( (fi = it1.current()) != 0 )
 		{
-			if(fi->fileName().tqcontains(contact_in_filename))
+			if(fi->fileName().contains(contact_in_filename))
 			{
 				rx.search(fi->fileName());
 				
@@ -288,9 +288,9 @@ void HistoryDialog::init(Kopete::Contact *c)
 	// END of kopete 0.7.x check
 
 	TQString logDir = locateLocal("data",TQString("kopete/logs/")+
-			c->protocol()->pluginId().tqreplace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) +
+			c->protocol()->pluginId().replace( TQRegExp(TQString::tqfromLatin1("[./~?*]")),TQString::tqfromLatin1("-")) +
 					TQString::tqfromLatin1( "/" ) +
-					c->account()->accountId().tqreplace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )
+					c->account()->accountId().replace( TQRegExp( TQString::tqfromLatin1( "[./~?*]" ) ), TQString::tqfromLatin1( "-" ) )
 								);
 	TQDir d(logDir);
 	d.setFilter( TQDir::Files | TQDir::NoSymLinks );
@@ -301,7 +301,7 @@ void HistoryDialog::init(Kopete::Contact *c)
 		TQFileInfoListIterator it( *list );
 		while ( (fi = it.current()) != 0 )
 		{
-			if(fi->fileName().tqcontains(contact_in_filename))
+			if(fi->fileName().contains(contact_in_filename))
 			{
 				
 				rx.search(fi->fileName());
@@ -375,7 +375,7 @@ void HistoryDialog::setMessages(TQValueList<Kopete::Message> msgs)
 			if (!mMainWidget->searchLine->text().isEmpty())
 			// If there is a search, then we hightlight the keywords
 			{
-				body = body.tqreplace(mMainWidget->searchLine->text(), "<span style=\"background-color:yellow\">" + mMainWidget->searchLine->text() + "</span>", false);
+				body = body.replace(mMainWidget->searchLine->text(), "<span style=\"background-color:yellow\">" + mMainWidget->searchLine->text() + "</span>", false);
 			}
 		
 			resultHTML += "(<b>" + (*it).timestamp().time().toString() + "</b>) "
@@ -482,7 +482,7 @@ void HistoryDialog::slotSearch()
 
 		TQDate month(curItem->date().year(),curItem->date().month(),1);
 		// if we haven't searched the relevant history logs, search them now
-		if (!monthsSearched[month].tqcontains(curItem->metaContact()))
+		if (!monthsSearched[month].contains(curItem->metaContact()))
 		{
 			monthsSearched[month].push_back(curItem->metaContact());
 			TQPtrList<Kopete::Contact> contacts = curItem->metaContact()->contacts();
@@ -505,12 +505,12 @@ void HistoryDialog::slotSearch()
 				while(!stream.atEnd())
 				{
 					textLine = stream.readLine();
-					if (textLine.tqcontains(mMainWidget->searchLine->text(), false))
+					if (textLine.contains(mMainWidget->searchLine->text(), false))
 					{
 						if(rx.search(textLine) != -1)
 						{
 							// only match message body
-							if (rx.cap(2).tqcontains(mMainWidget->searchLine->text()))
+							if (rx.cap(2).contains(mMainWidget->searchLine->text()))
 								matches[TQDate(curItem->date().year(),curItem->date().month(),rx.cap(1).toInt())].push_back(curItem->metaContact());
 						}
 						// this will happen when multiline messages are searched, properly
@@ -525,7 +525,7 @@ void HistoryDialog::slotSearch()
 		}
 
 		// relevant logfiles have been searched now, check if current date matches
-		if (matches[curItem->date()].tqcontains(curItem->metaContact()))
+		if (matches[curItem->date()].contains(curItem->metaContact()))
 			curItem->setVisible(true);
 
 		// Next date item