dc524c4 · unity8 · git.iko.soy

tests/mocks/Unity/Application/ApplicationDBusAdaptor.cpp+6−4

compare with xenial

unifiedsplit

@@ -34,10 +34,12 @@ MirSurfaceItem* topSurface(MirSurfaceItem* surface)

34 return nullptr;

35

36 MirSurfaceItem* child = NULL;

37− surface->foreachChildSurface([&](MirSurfaceItem* childSurface) {

37+ Q_FOREACH (MirSurfaceItem *childSurface, surface->childSurfaceList()) {

38+ child = topSurface(childSurface);

38− if (!child)

39+ if (child) {

39− child = topSurface(childSurface);

40+ break;

41+ }

40− });

42+ }

41 return child ? child : surface;

43 return child ? child : surface;

42}

44}

43

45

tests/mocks/Unity/Application/MirSurfaceItem.cpp+2−4

@@ -118,11 +118,9 @@ void MirSurfaceItem::addChildSurface(MirSurfaceItem* surface)

118 Q_EMIT childSurfacesChanged();

119}

120

121−void MirSurfaceItem::foreachChildSurface(std::function<void(MirSurfaceItem*)> f) const

121+QList<MirSurfaceItem*> MirSurfaceItem::childSurfaceList()

122{

123− for(MirSurfaceItem* child : m_children) {

123+ return m_children;

124− f(child);

125− }

126}

124}

127

125

128QQmlListProperty<MirSurfaceItem> MirSurfaceItem::childSurfaces()

126QQmlListProperty<MirSurfaceItem> MirSurfaceItem::childSurfaces()

tests/mocks/Unity/Application/MirSurfaceItem.h+1

@@ -69,6 +69,7 @@ public:

69 QString name() const { return m_name; }

70 MirSurfaceItem* parentSurface() const { return m_parentSurface; }

71 void foreachChildSurface(std::function<void(MirSurfaceItem*)> f) const;

72+ QList<MirSurfaceItem*> childSurfaceList();

72

73

73 void setApplication(ApplicationInfo* item);

74 void setApplication(ApplicationInfo* item);

74 void setParentSurface(MirSurfaceItem* item);

75 void setParentSurface(MirSurfaceItem* item);