From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- noatun/library/noatunarts/Session_impl.cpp | 4 ++-- noatun/library/noatunarts/StereoEffectStack_impl.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'noatun/library/noatunarts') diff --git a/noatun/library/noatunarts/Session_impl.cpp b/noatun/library/noatunarts/Session_impl.cpp index 63912801..edec216a 100644 --- a/noatun/library/noatunarts/Session_impl.cpp +++ b/noatun/library/noatunarts/Session_impl.cpp @@ -10,7 +10,7 @@ static bool compareArtsObjects(const Noatun::Listener &left, const Noatun::Liste return left._isEqual(right); } -list::iterator find(list &v, const Noatun::Listener &is, +list::iterator tqfind(list &v, const Noatun::Listener &is, bool (*compare)(const Noatun::Listener& left, const Noatun::Listener& right)) { for (list::iterator i=v.begin(); i!=v.end(); ++i) @@ -55,7 +55,7 @@ public: void removeListener(Noatun::Listener listener) { list::iterator i= - find(listeners, listener, &compareArtsObjects); + tqfind(listeners, listener, &compareArtsObjects); if (i!=listeners.end()) listeners.erase(i); } diff --git a/noatun/library/noatunarts/StereoEffectStack_impl.cpp b/noatun/library/noatunarts/StereoEffectStack_impl.cpp index 684d9694..107f06e9 100644 --- a/noatun/library/noatunarts/StereoEffectStack_impl.cpp +++ b/noatun/library/noatunarts/StereoEffectStack_impl.cpp @@ -85,7 +85,7 @@ class StereoEffectStack_impl : public StereoEffectStack_skel, public StdSynthMod list::iterator i = fx.begin(); bool found=false; - // seek through until we find 'after' + // seek through until we tqfind 'after' while(i != fx.end()) if((*i)->id == after) { -- cgit v1.2.1