From 458efa7b0c935cbaafa2791021a5f8f7241aa876 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 2 May 2011 22:38:52 +0000
Subject: 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
---
 src/base/Sets.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/base/Sets.h')

diff --git a/src/base/Sets.h b/src/base/Sets.h
index 4fe14d1..9884207 100644
--- a/src/base/Sets.h
+++ b/src/base/Sets.h
@@ -103,7 +103,7 @@ public:
     Iterator getHighestNote() const     { return m_highest;  }
     Iterator getLowestNote() const      { return m_lowest;   }
 
-    virtual bool contains(const Iterator &) const = 0;
+    virtual bool tqcontains(const Iterator &) const = 0;
 
     /// Return the pointed-to element, in Event form (public to work around gcc-2.95 bug)
     static Event *getAsEvent(const Iterator &i);
@@ -175,7 +175,7 @@ public:
     virtual int getMarkCountForChord() const;
     virtual std::vector<Mark> getMarksForChord() const;
     virtual std::vector<int> getPitches() const;
-    virtual bool contains(const Iterator &) const;
+    virtual bool tqcontains(const Iterator &) const;
 
     /**
      * Return an iterator pointing to the previous note before this
@@ -622,7 +622,7 @@ GenericChord<Element, Container, singleStaff>::getPitches() const
 
 template <class Element, class Container, bool singleStaff>
 bool
-GenericChord<Element, Container, singleStaff>::contains(const Iterator &itr) const
+GenericChord<Element, Container, singleStaff>::tqcontains(const Iterator &itr) const
 {
     for (typename std::vector<typename Container::iterator>::const_iterator
              i = std::vector<typename Container::iterator>::begin();
-- 
cgit v1.2.1