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, 8 insertions, 7 deletions

diff --git a/src/gui/rulers/RawNoteRuler.h b/src/gui/rulers/RawNoteRuler.h
index 8ced771..fc62946 100644
--- a/src/gui/rulers/RawNoteRuler.h
+++ b/src/gui/rulers/RawNoteRuler.h
@@ -52,16 +52,17 @@ class DefaultVelocityColour;
  * It has no editing function (yet?)
  */
 
-class RawNoteRuler : public QWidget
+class RawNoteRuler : public TQWidget
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     RawNoteRuler(RulerScale *rulerScale,
                  Segment *segment,
                  double xorigin = 0.0,
                  int height = 0,
-                 TQWidget* parent = 0,
+                 TQWidget* tqparent = 0,
                  const char *name = 0);
 
     ~RawNoteRuler();
@@ -70,8 +71,8 @@ public:
         m_segment = segment;
     }
 
-    virtual TQSize sizeHint() const;
-    virtual TQSize minimumSizeHint() const;
+    virtual TQSize tqsizeHint() const;
+    virtual TQSize tqminimumSizeHint() const;
 
     void setMinimumWidth(int width) { m_width = width; }
 
@@ -96,8 +97,8 @@ private:
         
         EventTreeNode(Segment::iterator n) : node(n) { }
         ~EventTreeNode() {
-            for (NodeList::iterator i = children.begin();
-                 i != children.end(); ++i) {
+            for (NodeList::iterator i = tqchildren.begin();
+                 i != tqchildren.end(); ++i) {
                 delete *i;
             }
         }
@@ -106,7 +107,7 @@ private:
         int getChildrenAboveOrBelow(bool below = false, int pitch = -1);
         
         Segment::iterator node;
-        NodeList children;
+        NodeList tqchildren;
     };
 
     std::pair<timeT, timeT> getExtents(Segment::iterator);