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

4 files changed, 32 insertions, 32 deletions

diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
index 416d3bfd0..8a9b4c886 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
@@ -79,12 +79,12 @@ KisCurve KisCurve::selectedPivots(bool selected)
 
 KisCurve KisCurve::subCurve(const KisPoint& tend)
 {
-    return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
+    return subCurve(find(tend).previousPivot(),find(tend));
 }
 
 KisCurve KisCurve::subCurve(const CurvePoint& tend)
 {
-    return subCurve(tqfind(tend).previousPivot(),tqfind(tend));
+    return subCurve(find(tend).previousPivot(),find(tend));
 }
 
 KisCurve KisCurve::subCurve(iterator tend)
@@ -94,12 +94,12 @@ KisCurve KisCurve::subCurve(iterator tend)
 
 KisCurve KisCurve::subCurve(const KisPoint& tstart, const KisPoint& tend)
 {
-    return subCurve(tqfind(tstart),tqfind(tend));
+    return subCurve(find(tstart),find(tend));
 }
 
 KisCurve KisCurve::subCurve(const CurvePoint& tstart, const CurvePoint& tend)
 {
-    return subCurve(tqfind(tstart),tqfind(tend));
+    return subCurve(find(tstart),find(tend));
 }
 
 KisCurve KisCurve::subCurve(iterator tstart, iterator tend)
@@ -137,7 +137,7 @@ KisCurve::iterator KisCurve::deleteCurve (const KisPoint& pos1, const KisPoint&
 
 KisCurve::iterator KisCurve::deleteCurve (const CurvePoint& pos1, const CurvePoint& pos2)
 {
-    return deleteCurve (tqfind(pos1),tqfind(pos2));
+    return deleteCurve (find(pos1),find(pos2));
 }
 
 KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::iterator pos2)
@@ -154,12 +154,12 @@ KisCurve::iterator KisCurve::deleteCurve (KisCurve::iterator pos1, KisCurve::ite
 
 KisCurve::iterator KisCurve::selectPivot(const KisPoint& pt, bool isSelected)
 {
-    return selectPivot(tqfind(CurvePoint(pt,true)),isSelected);
+    return selectPivot(find(CurvePoint(pt,true)),isSelected);
 }
 
 KisCurve::iterator KisCurve::selectPivot(const CurvePoint& pt, bool isSelected)
 {
-    return selectPivot(tqfind(pt),isSelected);
+    return selectPivot(find(pt),isSelected);
 }
 
 KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
@@ -171,7 +171,7 @@ KisCurve::iterator KisCurve::selectPivot(KisCurve::iterator it, bool isSelected)
     }
     KisCurve selected = pivots();
     for (iterator i = selected.begin(); i != selected.end(); i++)
-        (*tqfind((*i))).setSelected(sel);
+        (*find((*i))).setSelected(sel);
     (*it).setSelected(isSelected);
 
     return it;
@@ -184,7 +184,7 @@ KisCurve::iterator KisCurve::movePivot(const KisPoint& oldPt, const KisPoint& ne
 
 KisCurve::iterator KisCurve::movePivot(const CurvePoint& oldPt, const KisPoint& newPt)
 {
-    return movePivot(tqfind(oldPt), newPt);
+    return movePivot(find(oldPt), newPt);
 }
 
 KisCurve::iterator KisCurve::movePivot(KisCurve::iterator it, const KisPoint& newPt)
@@ -213,7 +213,7 @@ void KisCurve::deletePivot (const KisPoint& pt)
 
 void KisCurve::deletePivot (const CurvePoint& pt)
 {
-    deletePivot(tqfind(pt));
+    deletePivot(find(pt));
 }
 
 void KisCurve::deletePivot (KisCurve::iterator it)
diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.h b/chalk/plugins/tools/tool_curves/kis_curve_framework.h
index c27369aaf..614d51ff1 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.h
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.h
@@ -130,10 +130,10 @@ public:
     iterator begin() const;
     iterator lastIterator() const;
     iterator end() const;
-    iterator tqfind(const CurvePoint& pt);
-    iterator tqfind(const KisPoint& pt);
-    iterator tqfind(iterator it, const CurvePoint& pt);
-    iterator tqfind(iterator it, const KisPoint& pt);
+    iterator find(const CurvePoint& pt);
+    iterator find(const KisPoint& pt);
+    iterator find(iterator it, const CurvePoint& pt);
+    iterator find(iterator it, const KisPoint& pt);
     
     KisCurve pivots();
     KisCurve selectedPivots(bool = true);
@@ -312,34 +312,34 @@ inline KisCurve::iterator KisCurve::end() const
     return iterator(*this,m_curve.end());
 }
 
-inline KisCurve::iterator KisCurve::tqfind (const CurvePoint& pt)
+inline KisCurve::iterator KisCurve::find (const CurvePoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(pt));
+    return iterator(*this,m_curve.find(pt));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (const KisPoint& pt)
+inline KisCurve::iterator KisCurve::find (const KisPoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(CurvePoint(pt)));
+    return iterator(*this,m_curve.find(CurvePoint(pt)));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (KisCurve::iterator it, const CurvePoint& pt)
+inline KisCurve::iterator KisCurve::find (KisCurve::iterator it, const CurvePoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(it.position(),pt));
+    return iterator(*this,m_curve.find(it.position(),pt));
 }
 
-inline KisCurve::iterator KisCurve::tqfind (iterator it, const KisPoint& pt)
+inline KisCurve::iterator KisCurve::find (iterator it, const KisPoint& pt)
 {
-    return iterator(*this,m_curve.tqfind(it.position(),CurvePoint(pt)));
+    return iterator(*this,m_curve.find(it.position(),CurvePoint(pt)));
 }
 
 inline void KisCurve::calculateCurve(const KisPoint& start, const KisPoint& end, KisCurve::iterator it)
 {
-    calculateCurve(tqfind(CurvePoint(start)),tqfind(CurvePoint(end)),it);
+    calculateCurve(find(CurvePoint(start)),find(CurvePoint(end)),it);
 }
 
 inline void KisCurve::calculateCurve(const CurvePoint& start, const CurvePoint& end, KisCurve::iterator it)
 {
-    calculateCurve(tqfind(start),tqfind(end),it);
+    calculateCurve(find(start),find(end),it);
 }
 
 inline void KisCurve::calculateCurve(KisCurve::iterator, KisCurve::iterator, KisCurve::iterator)
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
index e3baf49c6..e18b096c2 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
@@ -289,7 +289,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
             continue;
         if (hint == BEZIERENDHINT && (m_actionOptions & SHIFTOPTION))
             continue;
-        if (pivotRect(qpos).tqcontains(pos)) {
+        if (pivotRect(qpos).contains(pos)) {
             inHandle.pushPoint((*it));
             if (hint == BEZIERENDHINT && !(m_actionOptions & SHIFTOPTION))
                 break;
@@ -300,7 +300,7 @@ KisCurve::iterator KisToolBezier::handleUnderMouse(const TQPoint& pos)
     if (inHandle.isEmpty())
         return m_curve->end();
 
-    return m_curve->tqfind(inHandle.last());
+    return m_curve->find(inHandle.last());
 }
 
 KisCurve::iterator KisToolBezier::drawPoint (KisCanvasPainter& gc, KisCurve::iterator point)
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index f98d2c729..08becf67c 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -124,7 +124,7 @@ void KisToolCurve::buttonPress(KisButtonPressEvent *event)
             m_curve->selectAll(false);
             draw(true, true);
             draw(m_curve->end());
-            m_previous = m_curve->tqfind(m_curve->last());
+            m_previous = m_curve->find(m_curve->last());
             m_current = m_curve->pushPivot(event->pos());
             if (m_curve->pivots().count() > 1)
                 m_curve->calculateCurve(m_previous,m_current,m_current);
@@ -158,7 +158,7 @@ void KisToolCurve::keyPress(TQKeyEvent *event)
         draw(false);
         m_dragging = false;
         m_curve->deleteSelected();
-        m_current = m_curve->tqfind(m_curve->last());
+        m_current = m_curve->find(m_curve->last());
         m_previous = m_curve->selectPivot(m_current);
         draw(false);
     }
@@ -250,12 +250,12 @@ KisCurve::iterator KisToolCurve::handleUnderMouse(const TQPoint& pos)
     KisCurve pivs = m_curve->pivots(), inHandle;
     KisCurve::iterator it;
     for (it = pivs.begin(); it != pivs.end(); it++) {
-        if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).tqcontains(pos))
+        if (pivotRect(m_subject->canvasController()->windowToView((*it).point().toTQPoint())).contains(pos))
             inHandle.pushPoint((*it));
     }
     if (inHandle.isEmpty())
         return m_curve->end();
-    return m_curve->tqfind(inHandle.last());
+    return m_curve->find(inHandle.last());
 }
 
 KisCurve::iterator KisToolCurve::selectByMouse(KisCurve::iterator it)
@@ -344,8 +344,8 @@ void KisToolCurve::draw(KisCurve::iterator inf, bool pivotonly, bool minimal)
                 return;
             }
             for (KisCurve::iterator i = sel.begin(); i != sel.end(); i++) {
-                it = m_curve->tqfind(*i).previousPivot();
-                finish = m_curve->tqfind(*i).nextPivot();
+                it = m_curve->find(*i).previousPivot();
+                finish = m_curve->find(*i).nextPivot();
                 if ((*finish).isSelected())
                     finish = finish.previousPivot();
                 while (it != finish) {