Initial TQt4 port of Rosegarden

This enables compilation under both Qt3 and Qt4


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

1 files changed, 31 insertions, 31 deletions

diff --git a/src/gui/editors/notation/NotationSelector.cpp b/src/gui/editors/notation/NotationSelector.cpp
index 2a28545..3b5eda2 100644
--- a/src/gui/editors/notation/NotationSelector.cpp
+++ b/src/gui/editors/notation/NotationSelector.cpp
@@ -71,14 +71,14 @@ NotationSelector::NotationSelector(NotationView* view)
         m_justSelectedBar(false),
         m_wholeStaffSelectionComplete(false)
 {
-    connect(m_parentView, TQT_SIGNAL(usedSelection()),
+    connect(m_tqparentView, TQT_SIGNAL(usedSelection()),
             this, TQT_SLOT(slotHideSelection()));
 
     connect(this, TQT_SIGNAL(editElement(NotationStaff *, NotationElement *, bool)),
-            m_parentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
+            m_tqparentView, TQT_SLOT(slotEditElement(NotationStaff *, NotationElement *, bool)));
 
     TQIconSet icon
-    (NotePixmapFactory::toQPixmap(NotePixmapFactory::
+    (NotePixmapFactory::toTQPixmap(NotePixmapFactory::
                                   makeToolbarPixmap("crotchet")));
     new KToggleAction(i18n("Switch to Insert Tool"), icon, 0, this,
                       TQT_SLOT(slotInsertSelected()), actionCollection(),
@@ -188,7 +188,7 @@ void NotationSelector::handleLeftButtonPress(timeT t,
     m_updateRect = true;
     m_startedFineDrag = false;
 
-    //m_parentView->setCursorPosition(p.x());
+    //m_tqparentView->setCursorPosition(p.x());
 }
 
 void NotationSelector::handleRightButtonPress(timeT t,
@@ -327,7 +327,7 @@ int NotationSelector::handleMouseMove(timeT, int,
 
     } else {
 
-        // Qt rectangle dimensions appear to be 1-based
+        // TQt rectangle dimensions appear to be 1-based
         if (w > 0)
             ++w;
         else
@@ -375,7 +375,7 @@ void NotationSelector::handleMouseRelease(timeT, int, TQMouseEvent *e)
 
                 // if the event was already part of the selection, we want to
                 // remove it
-                if (m_selectionToMerge->contains(m_clickedElement->event())) {
+                if (m_selectionToMerge->tqcontains(m_clickedElement->event())) {
                     m_selectionToMerge->removeEvent(m_clickedElement->event());
                 } else {
                     m_selectionToMerge->addEvent(m_clickedElement->event());
@@ -431,7 +431,7 @@ void NotationSelector::drag(int x, int y, bool final)
         return ;
 
     EventSelection *selection = m_nParentView->getCurrentSelection();
-    if (!selection || !selection->contains(m_clickedElement->event())) {
+    if (!selection || !selection->tqcontains(m_clickedElement->event())) {
         selection = new EventSelection(m_selectedStaff->getSegment());
         selection->addEvent(m_clickedElement->event());
     }
@@ -460,7 +460,7 @@ void NotationSelector::drag(int x, int y, bool final)
     ::Rosegarden::Key key;
 
     timeT dragTime = clickedTime;
-    double layoutX = m_clickedElement->getLayoutX();
+    double tqlayoutX = 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();
-        layoutX = elt->getLayoutX();
+        tqlayoutX = 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;
-                layoutX += part * restWidth / parts +
+                tqlayoutX += 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(),
-                                           layoutX, pitch, height,
+                                           tqlayoutX, pitch, height,
                                            Note::getNearestNote(duration),
                                            m_clickedElement->isGrace());
             m_lastDragPitch = pitch;
@@ -614,7 +614,7 @@ void NotationSelector::dragFine(int x, int y, bool final)
     EventSelection *selection = m_nParentView->getCurrentSelection();
     if (!selection)
         selection = new EventSelection(m_selectedStaff->getSegment());
-    if (!selection->contains(m_clickedElement->event()))
+    if (!selection->tqcontains(m_clickedElement->event()))
         selection->addEvent(m_clickedElement->event());
     m_nParentView->setCurrentSelection(selection);
 
@@ -711,7 +711,7 @@ void NotationSelector::ready()
     m_selectionRect->hide();
     m_selectionRect->setPen(GUIPalette::getColour(GUIPalette::SelectionRectangle));
 
-    m_nParentView->setCanvasCursor(Qt::arrowCursor);
+    m_nParentView->setCanvasCursor(TQt::arrowCursor);
     m_nParentView->setHeightTracking(false);
 }
 
@@ -738,57 +738,57 @@ void NotationSelector::slotInsertSelected()
 
 void NotationSelector::slotEraseSelected()
 {
-    m_parentView->actionCollection()->action("erase")->activate();
+    m_tqparentView->actionCollection()->action("erase")->activate();
 }
 
 void NotationSelector::slotCollapseRestsHard()
 {
-    m_parentView->actionCollection()->action("collapse_rests_aggressively")->activate();
+    m_tqparentView->actionCollection()->action("collapse_rests_aggressively")->activate();
 }
 
 void NotationSelector::slotRespellFlat()
 {
-    m_parentView->actionCollection()->action("respell_flat")->activate();
+    m_tqparentView->actionCollection()->action("respell_flat")->activate();
 }
 
 void NotationSelector::slotRespellSharp()
 {
-    m_parentView->actionCollection()->action("respell_sharp")->activate();
+    m_tqparentView->actionCollection()->action("respell_sharp")->activate();
 }
 
 void NotationSelector::slotRespellNatural()
 {
-    m_parentView->actionCollection()->action("respell_natural")->activate();
+    m_tqparentView->actionCollection()->action("respell_natural")->activate();
 }
 
 void NotationSelector::slotCollapseNotes()
 {
-    m_parentView->actionCollection()->action("collapse_notes")->activate();
+    m_tqparentView->actionCollection()->action("collapse_notes")->activate();
 }
 
 void NotationSelector::slotInterpret()
 {
-    m_parentView->actionCollection()->action("interpret")->activate();
+    m_tqparentView->actionCollection()->action("interpret")->activate();
 }
 
 void NotationSelector::slotStaffAbove()
 {
-    m_parentView->actionCollection()->action("move_events_up_staff")->activate();
+    m_tqparentView->actionCollection()->action("move_events_up_staff")->activate();
 }
 
 void NotationSelector::slotStaffBelow()
 {
-    m_parentView->actionCollection()->action("move_events_down_staff")->activate();
+    m_tqparentView->actionCollection()->action("move_events_down_staff")->activate();
 }
 
 void NotationSelector::slotMakeInvisible()
 {
-    m_parentView->actionCollection()->action("make_invisible")->activate();
+    m_tqparentView->actionCollection()->action("make_invisible")->activate();
 }
 
 void NotationSelector::slotMakeVisible()
 {
-    m_parentView->actionCollection()->action("make_visible")->activate();
+    m_tqparentView->actionCollection()->action("make_visible")->activate();
 }
 
 void NotationSelector::setViewCurrentSelection(bool preview)
@@ -838,7 +838,7 @@ EventSelection* NotationSelector::getSelection()
     TQCanvasItemList::Iterator it;
 
     TQRect rect = m_selectionRect->rect().normalize();
-    QCanvasNotationSprite *sprite = 0;
+    TQCanvasNotationSprite *sprite = 0;
 
     if (!m_selectedStaff) {
 
@@ -850,7 +850,7 @@ EventSelection* NotationSelector::getSelection()
 
         for (it = itemList.begin(); it != itemList.end(); ++it) {
             
-            if ((sprite = dynamic_cast<QCanvasNotationSprite*>(*it))) {
+            if ((sprite = dynamic_cast<TQCanvasNotationSprite*>(*it))) {
 
             NotationElement &el = sprite->getNotationElement();
 
@@ -870,11 +870,11 @@ EventSelection* NotationSelector::getSelection()
                 x += nbw;
             }
 
-            if (!rect.contains(x, int((*it)->y()), true)) {
+            if (!rect.tqcontains(x, int((*it)->y()), true)) {
                 // #988217 (Notation: Special column of pixels
                 // prevents sweep selection) -- for notes, test
                 // again with centred x-coord
-                if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
+                if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
                     continue;
                 }
             }
@@ -906,7 +906,7 @@ EventSelection* NotationSelector::getSelection()
 
     for (it = itemList.begin(); it != itemList.end(); ++it) {
 
-        if ((sprite = dynamic_cast<QCanvasNotationSprite*>(*it))) {
+        if ((sprite = dynamic_cast<TQCanvasNotationSprite*>(*it))) {
 
             NotationElement &el = sprite->getNotationElement();
             
@@ -925,11 +925,11 @@ EventSelection* NotationSelector::getSelection()
             // check if the element's rect
             // is actually included in the selection rect.
             //
-            if (!rect.contains(x, int((*it)->y()), true))  {
+            if (!rect.tqcontains(x, int((*it)->y()), true))  {
                 // #988217 (Notation: Special column of pixels
                 // prevents sweep selection) -- for notes, test again
                 // with centred x-coord
-                if (!el.isNote() || !rect.contains(x + nbw/2, int((*it)->y()), true)) {
+                if (!el.isNote() || !rect.tqcontains(x + nbw/2, int((*it)->y()), true)) {
                     continue;
                 }
             }