1 files changed, 23 insertions, 23 deletions

diff --git a/src/gui/kdeext/QCanvasSimpleSprite.h b/src/gui/kdeext/QCanvasSimpleSprite.h
index 7613b64..77f64f0 100644
--- a/src/gui/kdeext/QCanvasSimpleSprite.h
+++ b/src/gui/kdeext/QCanvasSimpleSprite.h
@@ -19,8 +19,8 @@
     COPYING included with this distribution for more information.
 */
 
-#ifndef QCANVASSIMPLESPRITE_H
-#define QCANVASSIMPLESPRITE_H
+#ifndef TQCANVASSIMPLESPRITE_H
+#define TQCANVASSIMPLESPRITE_H
 
 #include <tqwmatrix.h>
 #include <tqcanvas.h>
@@ -30,9 +30,9 @@
 namespace Rosegarden {
 
 /**
- * A TQCanvasSprite with 1 frame only
+ * A QCanvasSprite with 1 frame only
  */
-class QCanvasSimpleSprite : public QCanvasSprite
+class QCanvasSimpleSprite : public TQCanvasSprite
 {
 public:
     QCanvasSimpleSprite(TQPixmap*, TQCanvas*);
@@ -59,15 +59,15 @@ protected:
 class NotationElement;
 
 /**
- * A TQCanvasSprite referencing a NotationElement
+ * A QCanvasSprite referencing a NotationElement
  */
-class QCanvasNotationSprite : public QCanvasSimpleSprite
+class TQCanvasNotationSprite : public QCanvasSimpleSprite
 {
 public:
-    QCanvasNotationSprite(Rosegarden::NotationElement&, TQPixmap*, TQCanvas*);
-    QCanvasNotationSprite(Rosegarden::NotationElement&, TQCanvasPixmap*, TQCanvas*);
+    TQCanvasNotationSprite(Rosegarden::NotationElement&, TQPixmap*, TQCanvas*);
+    TQCanvasNotationSprite(Rosegarden::NotationElement&, TQCanvasPixmap*, TQCanvas*);
 
-    virtual ~QCanvasNotationSprite();
+    virtual ~TQCanvasNotationSprite();
     
     Rosegarden::NotationElement& getNotationElement() { return m_notationElement; }
 
@@ -77,35 +77,35 @@ protected:
     Rosegarden::NotationElement& m_notationElement;
 };
 
-class QCanvasNonElementSprite : public QCanvasSimpleSprite
+class TQCanvasNonElementSprite : public QCanvasSimpleSprite
 {
 public:
-    QCanvasNonElementSprite(TQPixmap *, TQCanvas *);
-    QCanvasNonElementSprite(TQCanvasPixmap *, TQCanvas *);
-    virtual ~QCanvasNonElementSprite();
+    TQCanvasNonElementSprite(TQPixmap *, TQCanvas *);
+    TQCanvasNonElementSprite(TQCanvasPixmap *, TQCanvas *);
+    virtual ~TQCanvasNonElementSprite();
 };
 
 /**
- * A TQCanvasSprite used for a time signature
+ * A QCanvasSprite used for a time signature
  */
-class QCanvasTimeSigSprite : public QCanvasNonElementSprite
+class TQCanvasTimeSigSprite : public TQCanvasNonElementSprite
 {
 public:
-    QCanvasTimeSigSprite(double layoutX, TQPixmap *, TQCanvas *);
-    QCanvasTimeSigSprite(double layoutX, TQCanvasPixmap *, TQCanvas *);
-    virtual ~QCanvasTimeSigSprite();
+    TQCanvasTimeSigSprite(double tqlayoutX, TQPixmap *, TQCanvas *);
+    TQCanvasTimeSigSprite(double tqlayoutX, TQCanvasPixmap *, TQCanvas *);
+    virtual ~TQCanvasTimeSigSprite();
 
-    void setLayoutX(double layoutX) { m_layoutX = layoutX; }
-    double getLayoutX() const { return m_layoutX; }
+    void setLayoutX(double tqlayoutX) { m_tqlayoutX = tqlayoutX; }
+    double getLayoutX() const { return m_tqlayoutX; }
 
 protected:
-    double m_layoutX;
+    double m_tqlayoutX;
 };
 
 /**
- * A TQCanvasSprite used for a staff name
+ * A QCanvasSprite used for a staff name
  */
-class QCanvasStaffNameSprite : public QCanvasNonElementSprite
+class QCanvasStaffNameSprite : public TQCanvasNonElementSprite
 {
 public:
     QCanvasStaffNameSprite(TQPixmap *, TQCanvas *);