rewrite some excessive c++11 to good old readable and compilable C++99
commitdc524c433bd8592f292be519e022d2feaff9cc00
authorMichael Zanetti <michael.zanetti@canonical.com>
dateFri 25 Jul 2014, 07:39 (12 years ago)
parentc79decf
tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp+6−4
@@ -34,10 +34,12 @@ MirSurfaceItem* topSurface(MirSurfaceItem* surface)
3434 return nullptr;
3535
3636 MirSurfaceItem* child = NULL;
37− surface->foreachChildSurface([&](MirSurfaceItem* childSurface) {
38− if (!child)
39− child = topSurface(childSurface);
40− });
37+ Q_FOREACH (MirSurfaceItem *childSurface, surface->childSurfaceList()) {
38+ child = topSurface(childSurface);
39+ if (child) {
40+ break;
41+ }
42+ }
4143 return child ? child : surface;
4244}
4345
tests/mocks/Unity/Application/MirSurfaceItem.cpp+2−4
@@ -118,11 +118,9 @@ void MirSurfaceItem::addChildSurface(MirSurfaceItem* surface)
118118 Q_EMIT childSurfacesChanged();
119119}
120120
121−void MirSurfaceItem::foreachChildSurface(std::function<void(MirSurfaceItem*)> f) const
121+QList<MirSurfaceItem*> MirSurfaceItem::childSurfaceList()
122122{
123− for(MirSurfaceItem* child : m_children) {
124− f(child);
125− }
123+ return m_children;
126124}
127125
128126QQmlListProperty<MirSurfaceItem> MirSurfaceItem::childSurfaces()
tests/mocks/Unity/Application/MirSurfaceItem.h+1
@@ -69,6 +69,7 @@ public:
6969 QString name() const { return m_name; }
7070 MirSurfaceItem* parentSurface() const { return m_parentSurface; }
7171 void foreachChildSurface(std::function<void(MirSurfaceItem*)> f) const;
72+ QList<MirSurfaceItem*> childSurfaceList();
7273
7374 void setApplication(ApplicationInfo* item);
7475 void setParentSurface(MirSurfaceItem* item);