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/MarkerRuler.h b/src/gui/rulers/MarkerRuler.h
index 29c90d0..6d99d68 100644
--- a/src/gui/rulers/MarkerRuler.h
+++ b/src/gui/rulers/MarkerRuler.h
@@ -50,20 +50,21 @@ class RosegardenGUIDoc;
 class MarkerRuler : public TQWidget, public HZoomable, public KXMLGUIClient
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     MarkerRuler(RosegardenGUIDoc *doc,
                      RulerScale *rulerScale,
                      int buttonHeight,
                      double xorigin = 0.0,
-                     TQWidget* parent = 0,
+                     TQWidget* tqparent = 0,
                      const char* name = 0,
                      WFlags f=0);
 
     virtual ~MarkerRuler();
     
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     void scrollHoriz(int x);
 
@@ -111,7 +112,7 @@ protected:
     
     RosegardenGUIDoc *m_doc;
     RulerScale *m_rulerScale;
-    KMainWindow* m_parentMainWindow;
+    KMainWindow* m_tqparentMainWindow;
 
 };