rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 18 insertions, 18 deletions

diff --git a/kalarm/alarmevent.cpp b/kalarm/alarmevent.cpp
index 54f60a3c4..c5e487caa 100644
--- a/kalarm/alarmevent.cpp
+++ b/kalarm/alarmevent.cpp
@@ -890,22 +890,22 @@ TQString KAEvent::uid(const TQString& id, tqStatus status)
 	TQString result = id;
 	tqStatus oldtqStatus;
 	int i, len;
-	if ((i = result.tqfind(EXPIRED_UID)) > 0)
+	if ((i = result.find(EXPIRED_UID)) > 0)
 	{
 		oldtqStatus = EXPIRED;
 		len = EXPIRED_UID.length();
 	}
-	else if ((i = result.tqfind(DISPLAYING_UID)) > 0)
+	else if ((i = result.find(DISPLAYING_UID)) > 0)
 	{
 		oldtqStatus = DISPLAYING;
 		len = DISPLAYING_UID.length();
 	}
-	else if ((i = result.tqfind(TEMPLATE_UID)) > 0)
+	else if ((i = result.find(TEMPLATE_UID)) > 0)
 	{
 		oldtqStatus = TEMPLATE;
 		len = TEMPLATE_UID.length();
 	}
-	else if ((i = result.tqfind(KORGANIZER_UID)) > 0)
+	else if ((i = result.find(KORGANIZER_UID)) > 0)
 	{
 		oldtqStatus = KORGANIZER;
 		len = KORGANIZER_UID.length();
@@ -913,7 +913,7 @@ TQString KAEvent::uid(const TQString& id, tqStatus status)
 	else
 	{
 		oldtqStatus = ACTIVE;
-		i = result.tqfindRev('-');
+		i = result.findRev('-');
 		len = 1;
 	}
 	if (status != oldtqStatus  &&  i > 0)
@@ -927,7 +927,7 @@ TQString KAEvent::uid(const TQString& id, tqStatus status)
 			case TEMPLATE:    part = TEMPLATE_UID;  break;
 			case KORGANIZER:  part = KORGANIZER_UID;  break;
 		}
-		result.tqreplace(i, len, part);
+		result.replace(i, len, part);
 	}
 	return result;
 }
@@ -937,13 +937,13 @@ TQString KAEvent::uid(const TQString& id, tqStatus status)
  */
 KAEvent::tqStatus KAEvent::uidtqStatus(const TQString& uid)
 {
-	if (uid.tqfind(EXPIRED_UID) > 0)
+	if (uid.find(EXPIRED_UID) > 0)
 		return EXPIRED;
-	if (uid.tqfind(DISPLAYING_UID) > 0)
+	if (uid.find(DISPLAYING_UID) > 0)
 		return DISPLAYING;
-	if (uid.tqfind(TEMPLATE_UID) > 0)
+	if (uid.find(TEMPLATE_UID) > 0)
 		return TEMPLATE;
-	if (uid.tqfind(KORGANIZER_UID) > 0)
+	if (uid.find(KORGANIZER_UID) > 0)
 		return KORGANIZER;
 	return ACTIVE;
 }
@@ -2551,7 +2551,7 @@ bool KAEvent::adjustStartOfDay(const Event::List& events)
 	{
 		Event* event = *evit;
 		const TQStringList cats = event->categories();
-		if (cats.tqfind(DATE_ONLY_CATEGORY) != cats.end())
+		if (cats.find(DATE_ONLY_CATEGORY) != cats.end())
 		{
 			// It's an untimed event, so fix it
 			TQTime oldTime = event->dtStart().time();
@@ -2732,14 +2732,14 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 					else
 						i = 0;     // invalid prefix
 				}
-				if (txt.tqfind(TEXT_PREFIX, i) == i)
+				if (txt.find(TEXT_PREFIX, i) == i)
 					i += TEXT_PREFIX.length();
-				else if (txt.tqfind(FILE_PREFIX, i) == i)
+				else if (txt.find(FILE_PREFIX, i) == i)
 				{
 					action = T_FILE;
 					i += FILE_PREFIX.length();
 				}
-				else if (txt.tqfind(COMMAND_PREFIX, i) == i)
+				else if (txt.find(COMMAND_PREFIX, i) == i)
 				{
 					action = T_COMMAND;
 					i += COMMAND_PREFIX.length();
@@ -2882,7 +2882,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * Convert simple LATECANCEL category to LATECANCEL:n where n = minutes late.
 			 */
 			TQStringList::Iterator it;
-			while ((it = cats.tqfind(LATE_CANCEL_CAT)) != cats.end())
+			while ((it = cats.find(LATE_CANCEL_CAT)) != cats.end())
 			{
 				cats.remove(it);
 				addLateCancel = true;
@@ -2915,7 +2915,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * Convert simple TMPLDEFTIME category to TMPLAFTTIME:n where n = minutes after.
 			 */
 			TQStringList::Iterator it;
-			while ((it = cats.tqfind(TEMPL_DEF_TIME_CAT)) != cats.end())
+			while ((it = cats.find(TEMPL_DEF_TIME_CAT)) != cats.end())
 			{
 				cats.remove(it);
 				cats.append(TQString("%1%2").tqarg(TEMPL_AFTER_TIME_CATEGORY).tqarg(0));
@@ -2929,7 +2929,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * Convert simple XTERM category to LOG:xterm:
 			 */
 			TQStringList::Iterator it;
-			while ((it = cats.tqfind(EXEC_IN_XTERM_CAT)) != cats.end())
+			while ((it = cats.find(EXEC_IN_XTERM_CAT)) != cats.end())
 			{
 				cats.remove(it);
 				cats.append(LOG_CATEGORY + xtermURL);
@@ -2952,7 +2952,7 @@ void KAEvent::convertKCalEvents(KCal::Calendar& calendar, int version, bool adju
 			 * alarm offsets to zero and deferral alarm offsets to be relative to
 			 * the next recurrence.
 			 */
-			bool dateOnly = (cats.tqfind(DATE_ONLY_CATEGORY) != cats.end());
+			bool dateOnly = (cats.find(DATE_ONLY_CATEGORY) != cats.end());
 			DateTime startDateTime(event->dtStart(), dateOnly);
 			// Convert the main alarm and get the next main trigger time from it
 			DateTime nextMainDateTime;