rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

4 files changed, 14 insertions, 14 deletions

diff --git a/conduits/memofileconduit/memofile-conduit.cc b/conduits/memofileconduit/memofile-conduit.cc
index 233f6af..42461f5 100644
--- a/conduits/memofileconduit/memofile-conduit.cc
+++ b/conduits/memofileconduit/memofile-conduit.cc
@@ -187,7 +187,7 @@ bool MemofileConduit::setAppInfo()
 
 	for (unsigned int i = 0; i < Pilot::CATEGORY_COUNT; i++)
 	{
-		if (fCategories.tqcontains(i)) {
+		if (fCategories.contains(i)) {
 			fMemoAppInfo->setCategoryName(i,fCategories[i]);
 		}
 	}
@@ -448,7 +448,7 @@ void MemofileConduit::deleteUnsyncedHHRecords()
 		Pilot::RecordIDList::iterator it;
 		for ( it = ids.begin(); it != ids.end(); ++it )
 		{
-			if (!_memofiles->tqfind(*it))
+			if (!_memofiles->find(*it))
 			{
 				DEBUGKPILOT << fname
 					<< "Deleting record with ID "<< *it <<" from handheld "
diff --git a/conduits/memofileconduit/memofileconduit.xmi b/conduits/memofileconduit/memofileconduit.xmi
index 9088d35..8e8ef1e 100644
--- a/conduits/memofileconduit/memofileconduit.xmi
+++ b/conduits/memofileconduit/memofileconduit.xmi
@@ -92,7 +92,7 @@
     </UML:Operation>
     <UML:Operation visibility="private" xmi.id="97" type="void" name="ensureDirectoryReady" />
     <UML:Operation visibility="public" xmi.id="98" type="void" name="loadIds" />
-    <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="tqfind" >
+    <UML:Operation visibility="public" xmi.id="99" type="Memofile" name="find" >
      <UML:Parameter visibility="public" xmi.id="100" value="" type=TQSTRING_OBJECT_NAME_STRING name="category" />
      <UML:Parameter visibility="public" xmi.id="101" value="" type=TQSTRING_OBJECT_NAME_STRING name="filename" />
     </UML:Operation>
diff --git a/conduits/memofileconduit/memofiles.cc b/conduits/memofileconduit/memofiles.cc
index c8ce67b..db3d8ca 100644
--- a/conduits/memofileconduit/memofiles.cc
+++ b/conduits/memofileconduit/memofiles.cc
@@ -89,7 +89,7 @@ void Memofiles::load (bool loadAll)
 // 				DEBUGKPILOT << fname
 // 				<< ": checking category: [" << categoryName
 // 				<< "], file: [" << file << "]." << endl;
-				Memofile * memofile = tqfind(categoryName, file);
+				Memofile * memofile = find(categoryName, file);
 				if (NULL == memofile) {
 					memofile = new Memofile(category, categoryName, file, _baseDirectory);
 					memofile->setModified(true);
@@ -316,7 +316,7 @@ bool Memofiles::loadFromMetadata ()
 	return true;
 }
 
-Memofile * Memofiles::tqfind (recordid_t id)
+Memofile * Memofiles::find (recordid_t id)
 {
 
 	Memofile * memofile;
@@ -331,7 +331,7 @@ Memofile * Memofiles::tqfind (recordid_t id)
 
 }
 
-Memofile * Memofiles::tqfind (const TQString & category, const TQString & filename)
+Memofile * Memofiles::find (const TQString & category, const TQString & filename)
 {
 
 	Memofile * memofile;
@@ -353,7 +353,7 @@ void Memofiles::deleteMemo(PilotMemo * memo)
 	if (! memo->isDeleted())
 		return;
 
-	Memofile * memofile = tqfind(memo->id());
+	Memofile * memofile = find(memo->id());
 	if (memofile) {
 		memofile->deleteFile();
 		_memofiles.remove(memofile);
@@ -375,7 +375,7 @@ void Memofiles::addModifiedMemo (PilotMemo * memo)
 	                + TQString::number(memo->id()) + CSL1("], title: [")
 	                + memo->getTitle() + CSL1("]. ");
 
-	Memofile * memofile = tqfind(memo->id());
+	Memofile * memofile = find(memo->id());
 
 	if (NULL == memofile) {
 		_cudCounter.created();
@@ -653,7 +653,7 @@ TQString Memofiles::filename(PilotMemo * memo)
 
 	if (filename.isEmpty()) {
 		TQString text = memo->text();
-		int i = text.tqfind(CSL1("\n"));
+		int i = text.find(CSL1("\n"));
 		if (i > 1) {
 			filename = text.left(i);
 		}
@@ -666,7 +666,7 @@ TQString Memofiles::filename(PilotMemo * memo)
 
 	TQString category = _categories[memo->category()];
 
-	Memofile * memofile = tqfind(category, filename);
+	Memofile * memofile = find(category, filename);
 
 	// if we couldn't find a memofile with this filename, or if the
 	// memofile that is found is the same as the memo that we're looking
@@ -683,7 +683,7 @@ TQString Memofiles::filename(PilotMemo * memo)
 	// for trouble.
 	while (NULL != memofile && uniq <=20) {
 		newfilename = TQString(filename + CSL1(".") + TQString::number(uniq++) );
-		memofile = tqfind(category, newfilename);
+		memofile = find(category, newfilename);
 	}
 
 	return newfilename;
@@ -694,7 +694,7 @@ TQString Memofiles::sanitizeName(TQString name)
 	TQString clean = name;
 	// safety net. we can't save a
 	// filesystem separator as part of a filename, now can we?
-	clean.tqreplace('/', CSL1("-"));
+	clean.replace('/', CSL1("-"));
 	return clean;
 }
 
diff --git a/conduits/memofileconduit/memofiles.h b/conduits/memofileconduit/memofiles.h
index 290cf3a..72b6ed4 100644
--- a/conduits/memofileconduit/memofiles.h
+++ b/conduits/memofileconduit/memofiles.h
@@ -55,8 +55,8 @@ public:
 
 	TQPtrList<Memofile> getModified();
 	TQPtrList<Memofile> getAll() { return _memofiles; } ;
-	Memofile * tqfind (const TQString & category, const TQString & filename);
-	Memofile * tqfind (recordid_t id);
+	Memofile * find (const TQString & category, const TQString & filename);
+	Memofile * find (recordid_t id);
 
 	MemoCategoryMap readCategoryMetadata();
 	void setCategories(MemoCategoryMap map) { _categories = map; } ;