35b6604 · unity8 · git.iko.soy

git.iko.soy/unity8

Update MirSurface API

commit35b6604670e69f056339d323fbb4c686f2b8bb29 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateTue 4 Aug 2015, 10:43 (11 years ago) parent1e3ad32

2 files changed+1−8

compare with xenial

unifiedsplit

tests/mocks/Unity/Application/MirSurface.cpp−6 tests/mocks/Unity/Application/MirSurface.h+1−2

tests/mocks/Unity/Application/MirSurface.cpp−6

@@ -180,9 +180,3 @@ void MirSurface::resize(int width, int height)

180180 Q_EMIT heightChanged();

181181 }

182182}

183−

184−void MirSurface::setSize(const QSize &size)

185−{

186− resize(size.width(), size.height());

187− Q_EMIT sizeChanged(size);

188−}

tests/mocks/Unity/Application/MirSurface.h+1−2

@@ -49,7 +49,7 @@ public:

4949 QString name() const override;

5050

5151 QSize size() const override { return QSize(width(),height()); }

52− void setSize(const QSize &size) override;

52+ void resize(int width, int height) override;

5353

5454 Mir::State state() const override;

5555 void setState(Mir::State) override;

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

7070

7171 int width() const;

7272 int height() const;

73− void resize(int width, int height);

7473

7574 /////

7675 // internal mock stuff