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, 5 insertions, 4 deletions

diff --git a/src/gui/rulers/ControlRuler.h b/src/gui/rulers/ControlRuler.h
index d9f4882..8bdf200 100644
--- a/src/gui/rulers/ControlRuler.h
+++ b/src/gui/rulers/ControlRuler.h
@@ -63,15 +63,16 @@ class EditViewBase;
 class ControlRuler : public RosegardenCanvasView, public SegmentObserver
 {
     Q_OBJECT
+  TQ_OBJECT
 
     friend class ControlItem;
 
 public:
     ControlRuler(Segment*,
                  RulerScale*,
-                 EditViewBase* parentView,
+                 EditViewBase* tqparentView,
                  TQCanvas*,
-                 TQWidget* parent=0, const char* name=0, WFlags f=0);
+                 TQWidget* tqparent=0, const char* name=0, WFlags f=0);
     virtual ~ControlRuler();
 
     virtual TQString getName() = 0;
@@ -121,7 +122,7 @@ protected:
 
     virtual void computeStaffOffset() {};
 
-    virtual void layoutItem(ControlItem*);
+    virtual void tqlayoutItem(ControlItem*);
 
 
 
@@ -144,7 +145,7 @@ protected:
 
     //--------------- Data members ---------------------------------
 
-    EditViewBase*               m_parentEditView;
+    EditViewBase*               m_tqparentEditView;
     TQScrollBar*                 m_mainHorizontalScrollBar;
     RulerScale*     m_rulerScale;
     EventSelection* m_eventSelection;