1 files changed, 13 insertions, 13 deletions

diff --git a/src/gui/general/LinedStaff.h b/src/gui/general/LinedStaff.h
index 1444bd2..359becf 100644
--- a/src/gui/general/LinedStaff.h
+++ b/src/gui/general/LinedStaff.h
@@ -29,14 +29,14 @@
 #include "base/FastVector.h"
 #include "base/Staff.h"
 #include "base/ViewElement.h"
-#include <qrect.h>
+#include <tqrect.h>
 #include <utility>
 #include <vector>
 
 
-class QCanvasLine;
-class QCanvasItem;
-class QCanvas;
+class TQCanvasLine;
+class TQCanvasItem;
+class TQCanvas;
 class isFirstBarInRow;
 class barNo;
 
@@ -99,7 +99,7 @@ protected:
      * \a lineThickness is the number of pixels thick a
      *    staff line should be
      */
-    LinedStaff(QCanvas *, Segment *, SnapGrid *,
+    LinedStaff(TQCanvas *, Segment *, SnapGrid *,
                int id, int resolution, int lineThickness);
 
     /**
@@ -125,7 +125,7 @@ protected:
      * \a rowSpacing is the distance in pixels between
      *    the tops of consecutive rows on this staff
      */
-    LinedStaff(QCanvas *, Segment *, SnapGrid *,
+    LinedStaff(TQCanvas *, Segment *, SnapGrid *,
                int id, int resolution, int lineThickness,
                double pageWidth, int rowsPerPage, int rowSpacing);
 
@@ -133,7 +133,7 @@ protected:
      * Create a new LinedStaff for the given Segment, with
      * either page or linear layout.
      */
-    LinedStaff(QCanvas *, Segment *, SnapGrid *,
+    LinedStaff(TQCanvas *, Segment *, SnapGrid *,
                int id, int resolution, int lineThickness, PageMode pageMode,
                double pageWidth, int rowsPerPage, int rowSpacing);
 
@@ -370,7 +370,7 @@ public:
      * Return the full width, height and origin of the bar containing
      * the given canvas cooordinates.
      */
-    virtual QRect getBarExtents(double x, int y) const;
+    virtual TQRect getBarExtents(double x, int y) const;
 
     /**
      * Set whether this is the current staff or not.  A staff that is
@@ -709,7 +709,7 @@ protected:
 
     //--------------- Data members ---------------------------------
 
-    QCanvas *m_canvas;
+    TQCanvas *m_canvas;
     SnapGrid *m_snapGrid;
 
     int      m_id;
@@ -732,12 +732,12 @@ protected:
 
     bool     m_current;
 
-    typedef std::vector<QCanvasItem *> ItemList;
+    typedef std::vector<TQCanvasItem *> ItemList;
     typedef std::vector<ItemList> ItemMatrix;
     ItemMatrix m_staffLines;
     ItemList m_staffConnectingLines;
 
-    typedef std::pair<double, QCanvasItem *> LineRec; // layout-x, line
+    typedef std::pair<double, TQCanvasItem *> LineRec; // layout-x, line
     typedef FastVector<LineRec> LineRecList;
     typedef FastVector<BarLine *> BarLineList;//!!! should be multiset I reckon
     static bool compareBars(const BarLine *, const BarLine *);
@@ -747,8 +747,8 @@ protected:
     LineRecList m_barConnectingLines;
     ItemList m_barNumbers;
 
-    QCanvasLine *m_pointer;
-    QCanvasLine *m_insertCursor;
+    TQCanvasLine *m_pointer;
+    TQCanvasLine *m_insertCursor;
     timeT m_insertCursorTime;
     bool m_insertCursorTimeValid;
 };