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

diff --git a/src/base/AnalysisTypes.h b/src/base/AnalysisTypes.h
index d7eabad..df3a416 100644
--- a/src/base/AnalysisTypes.h
+++ b/src/base/AnalysisTypes.h
@@ -62,8 +62,8 @@ NoChord = "no-chord",
 ///////////////////////////////////////////////////////////////////////////
 
 /**
- * ChordLabel names chords and identifies them from their masks. See
- * ChordLabel::checkMap() for details on what the masks are and
+ * ChordLabel names chords and identifies them from their tqmasks. See
+ * ChordLabel::checkMap() for details on what the tqmasks are and
  * AnalysisHelper::labelChords() for an example.
  */
 
@@ -71,7 +71,7 @@ class ChordLabel
 {
 public:
     ChordLabel();
-    ChordLabel(Key key, int mask, int bass);
+    ChordLabel(Key key, int tqmask, int bass);
     ChordLabel(ChordType type, int rootPitch, int inversion = 0) :
         m_data(type, rootPitch, inversion) { };
     int rootPitch();