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

diff --git a/src/gui/editors/notation/NotationGroup.h b/src/gui/editors/notation/NotationGroup.h
index c7b1134..ed1b7c2 100644
--- a/src/gui/editors/notation/NotationGroup.h
+++ b/src/gui/editors/notation/NotationGroup.h
@@ -73,13 +73,13 @@ public:
 
     /**
      * Writes the BEAMED, BEAM_ABOVE, and STEM_UP properties into the
-     * notes in the group, as appropriate.  Does not require layout x
+     * notes in the group, as appropriate.  Does not require tqlayout x
      * coordinates to have been set.
      */
     void applyStemProperties();
 
     /**
-     * Writes beam data into each note in the group.  Notes' layout x
+     * Writes beam data into each note in the group.  Notes' tqlayout x
      * coordinates must already have been set.  Does not require
      * applyStemProperties to have already been called.
      */
@@ -87,12 +87,12 @@ public:
 
     /**
      * Writes tupling line data into each note in the group.  Notes'
-     * layout x coordinates must already have been set.  Does nothing
+     * tqlayout x coordinates must already have been set.  Does nothing
      * if this is not a tupled group.
      */
     void applyTuplingLine(NotationStaff &);
 
-    virtual bool contains(const NELIterator &) const;
+    virtual bool tqcontains(const NELIterator &) const;
 
     virtual bool sample(const NELIterator &i, bool goingForwards);