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

diff --git a/src/base/Composition.cpp b/src/base/Composition.cpp
index cde3a8b..7c808e1 100644
--- a/src/base/Composition.cpp
+++ b/src/base/Composition.cpp
@@ -102,7 +102,7 @@ Composition::ReferenceSegment::getDuration() const
 }
 
 Composition::ReferenceSegment::iterator
-Composition::ReferenceSegment::find(Event *e)
+Composition::ReferenceSegment::tqfind(Event *e)
 {
     return std::lower_bound
 	(begin(), end(), e, ReferenceSegmentEventCmp());
@@ -116,7 +116,7 @@ Composition::ReferenceSegment::insert(Event *e)
 			     m_eventType, e->getType(), __FILE__, __LINE__);
     }
 
-    iterator i = find(e);
+    iterator i = tqfind(e);
 
     if (i != end() && (*i)->getAbsoluteTime() == e->getAbsoluteTime()) {
 
@@ -133,7 +133,7 @@ Composition::ReferenceSegment::insert(Event *e)
 void
 Composition::ReferenceSegment::erase(Event *e)
 {
-    iterator i = find(e);
+    iterator i = tqfind(e);
     if (i != end()) Impl::erase(i);
 }
 
@@ -141,7 +141,7 @@ Composition::ReferenceSegment::iterator
 Composition::ReferenceSegment::findTime(timeT t)
 {
     Event dummy("dummy", t, 0, MIN_SUBORDERING);
-    return find(&dummy);
+    return tqfind(&dummy);
 }
 
 Composition::ReferenceSegment::iterator
@@ -150,7 +150,7 @@ Composition::ReferenceSegment::findRealTime(RealTime t)
     Event dummy("dummy", 0, 0, MIN_SUBORDERING);
     dummy.set<Bool>(NoAbsoluteTimeProperty, true);
     setTempoTimestamp(&dummy, t);
-    return find(&dummy);
+    return tqfind(&dummy);
 }
 
 Composition::ReferenceSegment::iterator
@@ -298,7 +298,7 @@ Composition::weakDetachSegment(Segment *segment)
 }
 
 bool
-Composition::contains(const Segment *s)
+Composition::tqcontains(const Segment *s)
 {
     iterator i = findSegment(s);
     return (i != end());