1 files changed, 11 insertions, 11 deletions

diff --git a/src/gui/editors/notation/NotationView.cpp b/src/gui/editors/notation/NotationView.cpp
index 64b49ec..707e85c 100644
--- a/src/gui/editors/notation/NotationView.cpp
+++ b/src/gui/editors/notation/NotationView.cpp
@@ -3147,7 +3147,7 @@ void NotationView::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;
@@ -3829,12 +3829,12 @@ void NotationView::setMenuStates()
         NOTATION_DEBUG << "NotationView::setMenuStates: Have selection; it's " << m_currentEventSelection << " covering range from " << m_currentEventSelection->getStartTime() << " to " << m_currentEventSelection->getEndTime() << " (" << m_currentEventSelection->getSegmentEvents().size() << " events)" << endl;
 
         stateChanged("have_selection", KXMLGUIClient::StateNoReverse);
-        if (m_currentEventSelection->tqcontains
+        if (m_currentEventSelection->contains
                 (Note::EventType)) {
             stateChanged("have_notes_in_selection",
                          KXMLGUIClient::StateNoReverse);
         }
-        if (m_currentEventSelection->tqcontains
+        if (m_currentEventSelection->contains
                 (Note::EventRestType)) {
             stateChanged("have_rests_in_selection",
                          KXMLGUIClient::StateNoReverse);
@@ -3955,7 +3955,7 @@ void NotationView::slotNoteAction()
     const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
 
     NoteActionDataMap::Iterator noteAct =
-        m_noteActionDataMap->tqfind(sigSender->name());
+        m_noteActionDataMap->find(sigSender->name());
 
     if (noteAct != m_noteActionDataMap->end()) {
         m_lastNoteAction = sigSender->name();
@@ -3987,7 +3987,7 @@ void NotationView::slotAddMark()
     if (!m_currentEventSelection)
         return ;
 
-    MarkActionDataMap::Iterator i = m_markActionDataMap->tqfind(s->name());
+    MarkActionDataMap::Iterator i = m_markActionDataMap->find(s->name());
 
     if (i != m_markActionDataMap->end()) {
         addCommandToHistory(new AddMarkCommand
@@ -4000,7 +4000,7 @@ void NotationView::slotNoteChangeAction()
     const TQObject* sigSender = TQT_TQOBJECT_CONST(const_cast<const TQT_BASE_OBJECT_NAME*>(sender()));
 
     NoteChangeActionDataMap::Iterator noteAct =
-        m_noteChangeActionDataMap->tqfind(sigSender->name());
+        m_noteChangeActionDataMap->find(sigSender->name());
 
     if (noteAct != m_noteChangeActionDataMap->end()) {
         slotSetNoteDurations((**noteAct).noteType, (**noteAct).notationOnly);
@@ -4032,7 +4032,7 @@ void NotationView::initActionDataMaps()
                 (NotationStrings::getReferenceName(Note(type, dots), rest == 1));
 
                 TQString shortName(refName);
-                shortName.tqreplace(TQRegExp("-"), "_");
+                shortName.replace(TQRegExp("-"), "_");
 
                 TQString titleName
                 (NotationStrings::getNoteName(Note(type, dots)));
@@ -4041,7 +4041,7 @@ void NotationView::initActionDataMaps()
                             titleName.right(titleName.length() - 1);
 
                 if (rest) {
-                    titleName.tqreplace(TQRegExp(i18n("note")), i18n("rest"));
+                    titleName.replace(TQRegExp(i18n("note")), i18n("rest"));
                 }
 
                 int keycode = keys[type - Note::Shortest];
@@ -4068,7 +4068,7 @@ void NotationView::initActionDataMaps()
 
             TQString shortName(TQString("change_%1%2")
                               .tqarg(notationOnly ? "notation_" : "").tqarg(refName));
-            shortName.tqreplace(TQRegExp("-"), "_");
+            shortName.replace(TQRegExp("-"), "_");
 
             TQString titleName
             (NotationStrings::getNoteName(Note(type, 0)));
@@ -5658,7 +5658,7 @@ void NotationView::slotSwitchFromRestToNote()
     Note note(restInserter->getCurrentNote());
 
     TQString actionName = NotationStrings::getReferenceName(note, false);
-    actionName = actionName.tqreplace("-", "_");
+    actionName = actionName.replace("-", "_");
 
     KRadioAction *action = dynamic_cast<KRadioAction *>
         (actionCollection()->action(actionName));
@@ -5693,7 +5693,7 @@ void NotationView::slotSwitchFromNoteToRest()
     Note note(noteInserter->getCurrentNote());
 
     TQString actionName = NotationStrings::getReferenceName(note, true);
-    actionName = actionName.tqreplace("-", "_");
+    actionName = actionName.replace("-", "_");
 
     KRadioAction *action = dynamic_cast<KRadioAction *>
         (actionCollection()->action(actionName));