eb0750b · unity8 · git.iko.soy

git.iko.soy/unity8

s/SurfaceGeometry/SurfaceSize/

commiteb0750b93154e5b2bdc5fc516649c889d8751fc4 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateFri 22 Jan 2016, 13:44 (11 years ago) parent7577197

2 files changed+3−3

compare with xenial

unifiedsplit

tests/mocks/Unity/Application/ApplicationInfo.cpp+1−1 tests/plugins/Unity/Launcher/launchermodeltest.cpp+2−2

tests/mocks/Unity/Application/ApplicationInfo.cpp+1−1

@@ -284,7 +284,7 @@ QSize ApplicationInfo::initialSurfaceSize() const

284284 return m_initialSurfaceSize;

285285}

286286

287−void ApplicationInfo::setInitialSurfaceGeometry(const QSize &size)

287+void ApplicationInfo::setInitialSurfaceSize(const QSize &size)

288288{

289289 if (size != m_initialSurfaceSize) {

290290 m_initialSurfaceSize = size;

tests/plugins/Unity/Launcher/launchermodeltest.cpp+2−2

@@ -61,8 +61,8 @@ public:

6161 bool isTouchApp() const override { return true; }

6262 bool exemptFromLifecycle() const override { return false; }

6363 void setExemptFromLifecycle(bool) override {}

64− QRect initialSurfaceGeometry() const override { return QRect(); }

65− void setInitialSurfaceGeometry(const QRect &) override {}

64+ QSize initialSurfaceSize() const override { return QSize(); }

65+ void setInitialSurfaceSize(const QSize &) override {}

6666

6767 // Methods used for mocking (not in the interface)

6868 void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }