rename the following methods:

tqfind find
tqreplace replace
tqcontains contains


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

6 files changed, 10 insertions, 10 deletions

diff --git a/src/gui/editors/matrix/MatrixCanvasView.cpp b/src/gui/editors/matrix/MatrixCanvasView.cpp
index 5782164..ee0bab2 100644
--- a/src/gui/editors/matrix/MatrixCanvasView.cpp
+++ b/src/gui/editors/matrix/MatrixCanvasView.cpp
@@ -130,7 +130,7 @@ void MatrixCanvasView::contentsMousePressEvent(TQMouseEvent* e)
             // TQCanvas::collisions() can be a bit optimistic and report
             // items which are close to the point but not actually under it.
             // So a little sanity check helps.
-            if (!rect.tqcontains(p, true)) continue;
+            if (!rect.contains(p, true)) continue;
 
             mel = &(mRect->getMatrixElement());
 //            std::cerr << "MatrixCanvasView::contentsMousePressEvent: collision with an existing matrix element" << std::endl;
@@ -198,7 +198,7 @@ void MatrixCanvasView::contentsMouseMoveEvent(TQMouseEvent* e)
         QCanvasMatrixRectangle *mRect = 0;
 
         if ((mRect = dynamic_cast<QCanvasMatrixRectangle*>(item))) {
-            if (!mRect->rect().tqcontains(p, true))
+            if (!mRect->rect().contains(p, true))
                 continue;
             mel = &(mRect->getMatrixElement());
             MATRIX_DEBUG << "have element" << endl;
diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index c482a3c..b525b4b 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -124,14 +124,14 @@ void MatrixMover::handleLeftButtonPress(timeT time,
             EventSelection *newSelection;
 
             if ((e->state() & TQt::ShiftButton) ||
-                    selection->tqcontains(m_currentElement->event()))
+                    selection->contains(m_currentElement->event()))
                 newSelection = new EventSelection(*selection);
             else
                 newSelection = new EventSelection(m_currentStaff->getSegment());
 
             // if the selection already contains the event, remove it from the
             // selection if shift is pressed
-            if (selection->tqcontains(m_currentElement->event())){
+            if (selection->contains(m_currentElement->event())){
                 if (e->state() & TQt::ShiftButton)
                     newSelection->removeEvent(m_currentElement->event());
             } else {
diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index 75f5dbe..817b4c3 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -111,7 +111,7 @@ void MatrixResizer::handleLeftButtonPress(timeT,
             EventSelection *newSelection;
 
             if ((e->state() & TQt::ShiftButton) ||
-                    selection->tqcontains(m_currentElement->event()))
+                    selection->contains(m_currentElement->event()))
                 newSelection = new EventSelection(*selection);
             else
                 newSelection = new EventSelection(m_currentStaff->getSegment());
diff --git a/src/gui/editors/matrix/MatrixSelector.cpp b/src/gui/editors/matrix/MatrixSelector.cpp
index 14d6a0c..8d0f586 100644
--- a/src/gui/editors/matrix/MatrixSelector.cpp
+++ b/src/gui/editors/matrix/MatrixSelector.cpp
@@ -576,7 +576,7 @@ void MatrixSelector::setContextHelpFor(TQPoint p, bool ctrlPressed)
         }
 
         if ((mRect = dynamic_cast<QCanvasMatrixRectangle*>(item))) {
-            if (! mRect->rect().tqcontains(p, true)) continue;
+            if (! mRect->rect().contains(p, true)) continue;
             mel = &(mRect->getMatrixElement());
             break;
         }
diff --git a/src/gui/editors/matrix/MatrixStaff.cpp b/src/gui/editors/matrix/MatrixStaff.cpp
index 847c6f9..c7b1cfd 100644
--- a/src/gui/editors/matrix/MatrixStaff.cpp
+++ b/src/gui/editors/matrix/MatrixStaff.cpp
@@ -166,7 +166,7 @@ void MatrixStaff::positionElement(ViewElement* vel)
     //
     EventSelection *selection = m_view->getCurrentSelection();
 
-    if (selection && selection->tqcontains(el->event()))
+    if (selection && selection->contains(el->event()))
         el->setColour(GUIPalette::getColour(GUIPalette::SelectedElement));
     else if (el->event()->has(BaseProperties::TRIGGER_SEGMENT_ID))
         el->setColour(TQt::gray);
diff --git a/src/gui/editors/matrix/MatrixView.cpp b/src/gui/editors/matrix/MatrixView.cpp
index 680a31e..22db8a6 100644
--- a/src/gui/editors/matrix/MatrixView.cpp
+++ b/src/gui/editors/matrix/MatrixView.cpp
@@ -1156,7 +1156,7 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
                 i != s->getSegmentEvents().end(); ++i) {
 
             if (oldSelection && oldSelection->getSegment() == s->getSegment()
-                    && oldSelection->tqcontains(*i))
+                    && oldSelection->contains(*i))
                 continue;
 
             foundNewEvent = true;
@@ -1254,11 +1254,11 @@ void MatrixView::setCurrentSelection(EventSelection* s, bool preview,
 
     if (s) {
         stateChanged("have_selection", KXMLGUIClient::StateNoReverse);
-        if (s->tqcontains(Note::EventType)) {
+        if (s->contains(Note::EventType)) {
             stateChanged("have_notes_in_selection",
                          KXMLGUIClient::StateNoReverse);
         }
-        if (s->tqcontains(Note::EventRestType)) {
+        if (s->contains(Note::EventRestType)) {
             stateChanged("have_rests_in_selection",
                          KXMLGUIClient::StateNoReverse);
         }