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

diff --git a/src/gui/editors/matrix/MatrixResizer.cpp b/src/gui/editors/matrix/MatrixResizer.cpp
index fce4306..fc3af58 100644
--- a/src/gui/editors/matrix/MatrixResizer.cpp
+++ b/src/gui/editors/matrix/MatrixResizer.cpp
@@ -51,8 +51,8 @@
 namespace Rosegarden
 {
 
-MatrixResizer::MatrixResizer(MatrixView* parent)
-        : MatrixTool("MatrixResizer", parent),
+MatrixResizer::MatrixResizer(MatrixView* tqparent)
+        : MatrixTool("MatrixResizer", tqparent),
         m_currentElement(0),
         m_currentStaff(0)
 {
@@ -110,8 +110,8 @@ void MatrixResizer::handleLeftButtonPress(timeT,
         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());
@@ -289,27 +289,27 @@ void MatrixResizer::handleMouseRelease(timeT newTime,
 
 void MatrixResizer::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)));
-    m_mParentView->setCanvasCursor(Qt::sizeHorCursor);
+    m_mParentView->setCanvasCursor(TQt::sizeHorCursor);
     setBasicContextHelp();
 }
 
 void MatrixResizer::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)));
 }
 
 void MatrixResizer::slotMatrixScrolled(int newX, int newY)
 {
-    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 p(newX, newY);
 
     if (newP1.x() > oldP1.x()) {
-        p.setX(newX + m_parentView->getCanvasView()->visibleWidth());
+        p.setX(newX + m_tqparentView->getCanvasView()->visibleWidth());
     }
 
     p = m_mParentView->inverseMapPoint(p);