rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index fd42bcf3..75c8fec8 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -307,7 +307,7 @@ bool KoSpeaker::maybeSayWidget(TQWidget* w, const TQPoint& pos /*=TQPoint()*/)
         if (pos == TQPoint())
             item = iv->currentItem();
         else
-            item = iv->tqfindItem(iv->viewportToContents(iv->viewport()->mapFromGlobal(pos)));
+            item = iv->findItem(iv->viewportToContents(iv->viewport()->mapFromGlobal(pos)));
         if (item) {
             id = item->index();
             text = item->text();
@@ -431,7 +431,7 @@ bool KoSpeaker::sayWidget(const TQString& msg)
 {
     TQString s = msg;
     if (d->m_speakFlags & SpeakAccelerator) {
-        int amp = s.tqfind("&");
+        int amp = s.find("&");
         if (amp >= 0) {
             TQString acc = s.mid(++amp,1);
             acc = acc.stripWhiteSpace();
@@ -442,20 +442,20 @@ bool KoSpeaker::sayWidget(const TQString& msg)
     s.remove("&");
     if (TQStyleSheet::mightBeRichText(s)) {
         // kdDebug() << "richtext" << endl;
-        s.tqreplace(TQRegExp("</?[pbius]>"), "");
-        s.tqreplace(TQRegExp("</?h\\d>"), "");
-        s.tqreplace(TQRegExp("<(br|hr)>"), " ");
-        s.tqreplace(TQRegExp(
+        s.replace(TQRegExp("</?[pbius]>"), "");
+        s.replace(TQRegExp("</?h\\d>"), "");
+        s.replace(TQRegExp("<(br|hr)>"), " ");
+        s.replace(TQRegExp(
             "</?(qt|center|li|pre|div|span|em|strong|big|small|sub|sup|code|tt|font|nobr|ul|ol|dl|dt)>"), "");
-        s.tqreplace(TQRegExp("</?(table|tr|th|td).*>"), "");
-        s.tqreplace(TQRegExp("</?a\\s.+>"), "");
+        s.replace(TQRegExp("</?(table|tr|th|td).*>"), "");
+        s.replace(TQRegExp("</?a\\s.+>"), "");
         // Replace <img source="small|frame_text"> with "small frame_text image. "
-        s.tqreplace(TQRegExp("<img\\s.*(?:source=|src=)\"([^|\"]+)[|]?([^|\"]*)\">"), "\\1 \\2 image. ");
+        s.replace(TQRegExp("<img\\s.*(?:source=|src=)\"([^|\"]+)[|]?([^|\"]*)\">"), "\\1 \\2 image. ");
     }
     if (s.isEmpty()) return false;
-    s.tqreplace("Ctrl+", i18n("control plus "));
-    s.tqreplace("Alt+", i18n("alt plus "));
-    s.tqreplace("+", i18n(" plus "));
+    s.replace("Ctrl+", i18n("control plus "));
+    s.replace("Alt+", i18n("alt plus "));
+    s.replace("+", i18n(" plus "));
     sayScreenReaderOutput(s, "");
     return true;
 }
@@ -468,7 +468,7 @@ bool KoSpeaker::sayWidget(const TQString& msg)
 //         int id = m->idAt(i);
 //         TQMenuItem* mi = m->findItem(id);
 //         TQWidget* w = mi->widget();
-//         if (w->rect().tqcontains(w->mapFromGlobal(p))) return id;
+//         if (w->rect().contains(w->mapFromGlobal(p))) return id;
 //     }
 //     return -1;
 // }