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, 13 insertions, 13 deletions

diff --git a/src/gui/editors/matrix/MatrixMover.cpp b/src/gui/editors/matrix/MatrixMover.cpp
index adf558d..0b84537 100644
--- a/src/gui/editors/matrix/MatrixMover.cpp
+++ b/src/gui/editors/matrix/MatrixMover.cpp
@@ -54,8 +54,8 @@
 namespace Rosegarden
 {
 
-MatrixMover::MatrixMover(MatrixView* parent) :
-    MatrixTool("MatrixMover", parent),
+MatrixMover::MatrixMover(MatrixView* tqparent) :
+    MatrixTool("MatrixMover", tqparent),
     m_currentElement(0),
     m_currentStaff(0),
     m_lastPlayedPitch(-1)
@@ -101,7 +101,7 @@ void MatrixMover::handleLeftButtonPress(timeT time,
     MATRIX_DEBUG << "MatrixMover::handleLeftButtonPress() : time = " << time << ", el = " << el << endl;
     if (!el) return;
 
-    m_quickCopy = (e->state() & Qt::ControlButton);
+    m_quickCopy = (e->state() & TQt::ControlButton);
 
     if (!m_duplicateElements.empty()) {
         for (size_t i = 0; i < m_duplicateElements.size(); ++i) {
@@ -123,16 +123,16 @@ void MatrixMover::handleLeftButtonPress(timeT time,
         if (selection) {
             EventSelection *newSelection;
 
-            if ((e->state() & Qt::ShiftButton) ||
-                    selection->contains(m_currentElement->event()))
+            if ((e->state() & TQt::ShiftButton) ||
+                    selection->tqcontains(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->contains(m_currentElement->event())){
-                if (e->state() & Qt::ShiftButton)
+            if (selection->tqcontains(m_currentElement->event())){
+                if (e->state() & TQt::ShiftButton)
                     newSelection->removeEvent(m_currentElement->event());
             } else {
                 newSelection->addEvent(m_currentElement->event());
@@ -207,7 +207,7 @@ int MatrixMover::handleMouseMove(timeT newTime,
     << newTime << endl;
 
     if (e) {
-        setBasicContextHelp(e->state() & Qt::ControlButton);
+        setBasicContextHelp(e->state() & TQt::ControlButton);
     }
 
     if (!m_currentElement || !m_currentStaff)
@@ -420,17 +420,17 @@ void MatrixMover::handleMouseRelease(timeT newTime,
 
 void MatrixMover::ready()
 {
-    connect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
+    connect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
             this, TQT_SLOT(slotMatrixScrolled(int, int)));
     connect(this, TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
             m_mParentView, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
-    m_mParentView->setCanvasCursor(Qt::sizeAllCursor);
+    m_mParentView->setCanvasCursor(TQt::sizeAllCursor);
     setBasicContextHelp();
 }
 
 void MatrixMover::stow()
 {
-    disconnect(m_parentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
+    disconnect(m_tqparentView->getCanvasView(), TQT_SIGNAL(contentsMoving (int, int)),
                this, TQT_SLOT(slotMatrixScrolled(int, int)));
     disconnect(this, TQT_SIGNAL(hoveredOverNoteChanged(int, bool, timeT)),
                m_mParentView, TQT_SLOT(slotHoveredOverNoteChanged(int, bool, timeT)));
@@ -441,8 +441,8 @@ void MatrixMover::slotMatrixScrolled(int newX, int newY)
     if (!m_currentElement)
         return ;
 
-    TQPoint newP1(newX, newY), oldP1(m_parentView->getCanvasView()->contentsX(),
-                                    m_parentView->getCanvasView()->contentsY());
+    TQPoint newP1(newX, newY), oldP1(m_tqparentView->getCanvasView()->contentsX(),
+                                    m_tqparentView->getCanvasView()->contentsY());
 
     TQPoint offset = newP1 - oldP1;