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

diff --git a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
index 128d3f9..d8d7b06 100644
--- a/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
+++ b/src/gui/editors/matrix/QCanvasMatrixDiamond.cpp
@@ -52,7 +52,7 @@ TQPointArray QCanvasMatrixDiamond::areaPoints() const
     int pw = (pen().width() + 1) / 2;
     if ( pw < 1 )
         pw = 1;
-    if ( pen() == NoPen )
+    if ( pen() == Qt::NoPen )
         pw = 0;
     pa[0] = TQPoint((int)x() - height() / 2 - pw, (int)y() - pw);
     pa[1] = pa[0] + TQPoint(height() + pw * 2, 0);
@@ -68,7 +68,7 @@ void QCanvasMatrixDiamond::drawShape(TQPainter & p)
 
     TQPointArray pa(4);
     int q = height() / 2 + 2;
-    TQPoint mapPos = p.worldMatrix().map(TQPoint(int(x()), int(y())));
+    TQPoint mapPos = p.tqworldMatrix().map(TQPoint(int(x()), int(y())));
 
     pa[0] = TQPoint(mapPos.x(), mapPos.y() - 3);
     pa[1] = TQPoint(mapPos.x() + q, mapPos.y() - 3 + q);