1 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/editors/notation/NotationCanvasView.cpp b/src/gui/editors/notation/NotationCanvasView.cpp
index fb7d2d9..40c2d59 100644
--- a/src/gui/editors/notation/NotationCanvasView.cpp
+++ b/src/gui/editors/notation/NotationCanvasView.cpp
@@ -49,9 +49,9 @@ namespace Rosegarden
 {
 
 NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr,
-                                       TQCanvas *viewing, TQWidget *parent,
+                                       TQCanvas *viewing, TQWidget *tqparent,
                                        const char *name, WFlags f) :
-        RosegardenCanvasView(viewing, parent, name, f),
+        RosegardenCanvasView(viewing, tqparent, name, f),
         m_linedStaffManager(staffmgr),
         m_lastYPosNearStaff(0),
         m_currentStaff(0),
@@ -70,13 +70,13 @@ NotationCanvasView::NotationCanvasView(const LinedStaffManager &staffmgr,
 
     viewport()->setMouseTracking(true);
 
-    m_heightMarker = new QCanvasItemGroup(viewing);
+    m_heightMarker = new TQCanvasItemGroup(viewing);
 
-    m_vert1 = new QCanvasLineGroupable(viewing, m_heightMarker);
+    m_vert1 = new TQCanvasLineGroupable(viewing, m_heightMarker);
     m_vert1->setPoints(0, 0, 0, 8);
     m_vert1->setPen(TQPen(TQColor(64, 64, 64), 1));
 
-    m_vert2 = new QCanvasLineGroupable(viewing, m_heightMarker);
+    m_vert2 = new TQCanvasLineGroupable(viewing, m_heightMarker);
     m_vert2->setPoints(17, 0, 17, 8);
     m_vert2->setPen(TQPen(TQColor(64, 64, 64), 1));
 
@@ -115,7 +115,7 @@ NotationCanvasView::contentsMouseMoveEvent(TQMouseEvent *e)
 
     if (!m_currentStaff) {
 
-        emit hoveredOverNoteChanged(TQString::null);
+        emit hoveredOverNoteChanged(TQString());
         if (prevStaff) {
             m_heightMarker->hide();
             canvas()->update();
@@ -191,10 +191,10 @@ void NotationCanvasView::contentsMousePressEvent(TQMouseEvent *e)
             return ;
         }
 
-        QCanvasNotationSprite *sprite =
-            dynamic_cast<QCanvasNotationSprite*>(*it);
+        TQCanvasNotationSprite *sprite =
+            dynamic_cast<TQCanvasNotationSprite*>(*it);
         if (!sprite) {
-            if (dynamic_cast<QCanvasNonElementSprite *>(*it)) {
+            if (dynamic_cast<TQCanvasNonElementSprite *>(*it)) {
                 emit nonNotationItemPressed(e, *it);
                 return ;
             } else if (dynamic_cast<TQCanvasText *>(*it)) {
@@ -378,8 +378,8 @@ NotationCanvasView::setHeightMarkerHeight(TQMouseEvent *e)
 
         for (i = 0; i < legerLineCount; ++i) {
 
-            QCanvasLineGroupable *line =
-                new QCanvasLineGroupable(canvas(), m_heightMarker);
+            TQCanvasLineGroupable *line =
+                new TQCanvasLineGroupable(canvas(), m_heightMarker);
 
             line->setPen(TQPen(TQColor(64, 64, 64), 1));
 
@@ -411,14 +411,14 @@ NotationCanvasView::getElementAtXCoord(TQMouseEvent *e) // any old element
     TQCanvasItemList itemList = canvas()->collisions(threshold);
 
     TQCanvasItemList::Iterator it;
-    QCanvasNotationSprite* sprite = 0;
+    TQCanvasNotationSprite* sprite = 0;
 
     for (it = itemList.begin(); it != itemList.end(); ++it)
     {
 
         TQCanvasItem *item = *it;
 
-        if ((sprite = dynamic_cast<QCanvasNotationSprite*>(item))) {
+        if ((sprite = dynamic_cast<TQCanvasNotationSprite*>(item))) {
             return & (sprite->getNotationElement());
         }
     }