diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-09 02:23:29 +0000 |
commit | 1905a36716979889e47bb0fdd7bf33c6204c5a6d (patch) | |
tree | 0daef2425269e8053435f4f7e734091d72e27be0 /src/gui/editors/notation/NotationSelector.cpp | |
parent | 05768569bc9c8b3eb75c837d305058fc280db63c (diff) | |
download | rosegarden-1905a36716979889e47bb0fdd7bf33c6204c5a6d.tar.gz rosegarden-1905a36716979889e47bb0fdd7bf33c6204c5a6d.zip |
Remove the tq in front of these incorrectly TQt4-converted methods/data members:
tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/rosegarden@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/gui/editors/notation/NotationSelector.cpp')
-rw-r--r-- | src/gui/editors/notation/NotationSelector.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp index 3b5eda2..acd5604 100644 --- a/src/gui/editors/notation/NotationSelector.cpp +++ b/src/gui/editors/notation/NotationSelector.cpp @@ -71,11 +71,11 @@ NotationSelector::NotationSelector(NotationView* view) m_justSelectedBar(false), m_wholeStaffSelectionComplete(false) { - connect(m_tqparentView, TQT_SIGNAL(usedSelection()), + connect(m_parentView, TQT_SIGNAL(usedSelection()), this, TQT_SLOT(slotHideSelection())); connect(this, TQT_SIGNAL(editElement(NotationStaff *, NotationElement *, bool)), - m_tqparentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool))); + m_parentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool))); TQIconSet icon (NotePixmapFactory::toTQPixmap(NotePixmapFactory:: @@ -188,7 +188,7 @@ void NotationSelector::handleLeftButtonPress(timeT t, m_updateRect = true; m_startedFineDrag = false; - //m_tqparentView->setCursorPosition(p.x()); + //m_parentView->setCursorPosition(p.x()); } void NotationSelector::handleRightButtonPress(timeT t, @@ -460,7 +460,7 @@ void NotationSelector::drag(int x, int y, bool final) ::Rosegarden::Key key; timeT dragTime = clickedTime; - double tqlayoutX = m_clickedElement->getLayoutX(); + double layoutX = m_clickedElement->getLayoutX(); timeT duration = m_clickedElement->getViewDuration(); NotationElementList::iterator itr = @@ -470,7 +470,7 @@ void NotationSelector::drag(int x, int y, bool final) NotationElement *elt = dynamic_cast<NotationElement *>(*itr); dragTime = elt->getViewAbsoluteTime(); - tqlayoutX = elt->getLayoutX(); + layoutX = elt->getLayoutX(); if (elt->isRest() && duration > 0 && elt->getCanvasItem()) { @@ -490,7 +490,7 @@ void NotationSelector::drag(int x, int y, bool final) part = parts - 1; dragTime += part * restDuration / parts; - tqlayoutX += part * restWidth / parts + + layoutX += part * restWidth / parts + (restX - elt->getCanvasX()); } } @@ -532,7 +532,7 @@ void NotationSelector::drag(int x, int y, bool final) m_clickedElement->isNote()) { m_nParentView->showPreviewNote(targetStaff->getId(), - tqlayoutX, pitch, height, + layoutX, pitch, height, Note::getNearestNote(duration), m_clickedElement->isGrace()); m_lastDragPitch = pitch; @@ -738,57 +738,57 @@ void NotationSelector::slotInsertSelected() void NotationSelector::slotEraseSelected() { - m_tqparentView->actionCollection()->action("erase")->activate(); + m_parentView->actionCollection()->action("erase")->activate(); } void NotationSelector::slotCollapseRestsHard() { - m_tqparentView->actionCollection()->action("collapse_rests_aggressively")->activate(); + m_parentView->actionCollection()->action("collapse_rests_aggressively")->activate(); } void NotationSelector::slotRespellFlat() { - m_tqparentView->actionCollection()->action("respell_flat")->activate(); + m_parentView->actionCollection()->action("respell_flat")->activate(); } void NotationSelector::slotRespellSharp() { - m_tqparentView->actionCollection()->action("respell_sharp")->activate(); + m_parentView->actionCollection()->action("respell_sharp")->activate(); } void NotationSelector::slotRespellNatural() { - m_tqparentView->actionCollection()->action("respell_natural")->activate(); + m_parentView->actionCollection()->action("respell_natural")->activate(); } void NotationSelector::slotCollapseNotes() { - m_tqparentView->actionCollection()->action("collapse_notes")->activate(); + m_parentView->actionCollection()->action("collapse_notes")->activate(); } void NotationSelector::slotInterpret() { - m_tqparentView->actionCollection()->action("interpret")->activate(); + m_parentView->actionCollection()->action("interpret")->activate(); } void NotationSelector::slotStaffAbove() { - m_tqparentView->actionCollection()->action("move_events_up_staff")->activate(); + m_parentView->actionCollection()->action("move_events_up_staff")->activate(); } void NotationSelector::slotStaffBelow() { - m_tqparentView->actionCollection()->action("move_events_down_staff")->activate(); + m_parentView->actionCollection()->action("move_events_down_staff")->activate(); } void NotationSelector::slotMakeInvisible() { - m_tqparentView->actionCollection()->action("make_invisible")->activate(); + m_parentView->actionCollection()->action("make_invisible")->activate(); } void NotationSelector::slotMakeVisible() { - m_tqparentView->actionCollection()->action("make_visible")->activate(); + m_parentView->actionCollection()->action("make_visible")->activate(); } void NotationSelector::setViewCurrentSelection(bool preview) |