summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2009-11-11 02:26:04 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2009-11-11 02:26:04 (GMT)
commitdf5445249aac62a9eddaeab25355ba04edcf407b (patch)
tree634c83920a974b8640afc7f572356eb73e977ae1
parentef94f258c3f442e155e210f3bfd4e0390f658d0f (diff)
downloadQt-df5445249aac62a9eddaeab25355ba04edcf407b.zip
Qt-df5445249aac62a9eddaeab25355ba04edcf407b.tar.gz
Qt-df5445249aac62a9eddaeab25355ba04edcf407b.tar.bz2
Import change 950964 from phonon-svn.
r950964 | dfaure | 2009-04-08 19:26:40 +1000 (Wed, 08 Apr 2009) | 2 lines fix compilation with -DQT_STRICT_ITERATORS Reviewed-by: Justin McPherson
-rw-r--r--src/3rdparty/phonon/phonon/path.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/phonon/path.cpp b/src/3rdparty/phonon/phonon/path.cpp
index ef3530c..20c0fe5 100644
--- a/src/3rdparty/phonon/phonon/path.cpp
+++ b/src/3rdparty/phonon/phonon/path.cpp
@@ -244,8 +244,8 @@ bool Path::disconnect()
//lets build the disconnection list
QList<QObjectPair> disco;
if (list.count() >=2 ) {
- QObjectList::const_iterator it = list.begin();
- for(;it+1 != list.end();++it) {
+ QObjectList::const_iterator it = list.constBegin();
+ for(;it+1 != list.constEnd();++it) {
disco << QObjectPair(*it, *(it+1));
}
}