1 files changed, 31 insertions, 31 deletions

diff --git a/src/gui/rulers/ControlRuler.h b/src/gui/rulers/ControlRuler.h
index ac6eba4..d9f4882 100644
--- a/src/gui/rulers/ControlRuler.h
+++ b/src/gui/rulers/ControlRuler.h
@@ -28,20 +28,20 @@
 
 #include "base/Segment.h"
 #include "gui/general/RosegardenCanvasView.h"
-#include <qcolor.h>
-#include <qpoint.h>
-#include <qstring.h>
+#include <tqcolor.h>
+#include <tqpoint.h>
+#include <tqstring.h>
 #include <utility>
 
 
-class QWidget;
-class QWheelEvent;
-class QScrollBar;
-class QPopupMenu;
-class QMouseEvent;
-class QContextMenuEvent;
-class QCanvasRectangle;
-class QCanvas;
+class TQWidget;
+class TQWheelEvent;
+class TQScrollBar;
+class TQPopupMenu;
+class TQMouseEvent;
+class TQContextMenuEvent;
+class TQCanvasRectangle;
+class TQCanvas;
 
 
 namespace Rosegarden
@@ -70,11 +70,11 @@ public:
     ControlRuler(Segment*,
                  RulerScale*,
                  EditViewBase* parentView,
-                 QCanvas*,
-                 QWidget* parent=0, const char* name=0, WFlags f=0);
+                 TQCanvas*,
+                 TQWidget* parent=0, const char* name=0, WFlags f=0);
     virtual ~ControlRuler();
 
-    virtual QString getName() = 0;
+    virtual TQString getName() = 0;
 
     int getMaxItemValue() { return m_maxItemValue; }
     void setMaxItemValue(int val) { m_maxItemValue = val; }
@@ -85,7 +85,7 @@ public:
 
     int applyTool(double x, int val);
 
-    QCanvasRectangle* getSelectionRectangle() { return m_selectionRect; }
+    TQCanvasRectangle* getSelectionRectangle() { return m_selectionRect; }
 
     RulerScale* getRulerScale() { return m_rulerScale; }
 
@@ -100,10 +100,10 @@ public:
     void flipForwards();
     void flipBackwards();
 
-    void setMainHorizontalScrollBar(QScrollBar* s ) { m_mainHorizontalScrollBar = s; }
+    void setMainHorizontalScrollBar(TQScrollBar* s ) { m_mainHorizontalScrollBar = s; }
 
 signals:
-    void stateChange(const QString&, bool);
+    void stateChange(const TQString&, bool);
 
 public slots:
     /// override RosegardenCanvasView - we don't want to change the main hscrollbar
@@ -111,13 +111,13 @@ public slots:
     virtual void slotUpdateElementsHPos();
     
 protected:
-    virtual void contentsMousePressEvent(QMouseEvent*);
-    virtual void contentsMouseReleaseEvent(QMouseEvent*);
-    virtual void contentsMouseMoveEvent(QMouseEvent*);
-    virtual void contentsWheelEvent(QWheelEvent*);
-    virtual void contentsContextMenuEvent(QContextMenuEvent*);
+    virtual void contentsMousePressEvent(TQMouseEvent*);
+    virtual void contentsMouseReleaseEvent(TQMouseEvent*);
+    virtual void contentsMouseMoveEvent(TQMouseEvent*);
+    virtual void contentsWheelEvent(TQWheelEvent*);
+    virtual void contentsContextMenuEvent(TQContextMenuEvent*);
 
-    virtual QScrollBar* getMainHorizontalScrollBar();
+    virtual TQScrollBar* getMainHorizontalScrollBar();
 
     virtual void computeStaffOffset() {};
 
@@ -134,24 +134,24 @@ protected:
 
     int valueToHeight(long val);
     long heightToValue(int height);
-    QColor valueToColour(int max, int val);
+    TQColor valueToColour(int max, int val);
 
     void clearSelectedItems();
     void updateSelection();
 
-    void setMenuName(QString menuName) { m_menuName = menuName; }
+    void setMenuName(TQString menuName) { m_menuName = menuName; }
     void createMenu();
 
     //--------------- Data members ---------------------------------
 
     EditViewBase*               m_parentEditView;
-    QScrollBar*                 m_mainHorizontalScrollBar;
+    TQScrollBar*                 m_mainHorizontalScrollBar;
     RulerScale*     m_rulerScale;
     EventSelection* m_eventSelection;
     Segment*        m_segment;
 
     ControlItem* m_currentItem;
-    QCanvasItemList m_selectedItems;
+    TQCanvasItemList m_selectedItems;
 
     ControlTool *m_tool;
 
@@ -161,15 +161,15 @@ protected:
 
     double m_currentX;
 
-    QPoint m_lastEventPos;
+    TQPoint m_lastEventPos;
     bool m_itemMoved;
 
     bool m_selecting;
     ControlSelector* m_selector;
-    QCanvasRectangle* m_selectionRect;
+    TQCanvasRectangle* m_selectionRect;
 
-    QString m_menuName;
-    QPopupMenu* m_menu;
+    TQString m_menuName;
+    TQPopupMenu* m_menu;
 
     TextFloat  *m_numberFloat;