git.iko.soy/unity8
on xenial help sign in
Remove obsolete ApplicationManager methods
commit7a5cf51810875ae585705a03dc1d55ca60eba0e4 authorDaniel d'Andrada <daniel.dandrada@canonical.com> dateTue 5 Apr 2016, 16:08 (11 years ago) parenta8f73c8
4 files changed+1−32
compare with xenial
unifiedsplit
qml/Shell.qml−3 tests/mocks/Unity/Application/ApplicationManager.cpp−24 tests/mocks/Unity/Application/ApplicationManager.h−2 tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−3
qml/Shell.qml−3
@@ -172,9 +172,6 @@ Item {
172172
173173 Component.onCompleted: {
174174 theme.name = "Ubuntu.Components.Themes.SuruDark"
175− if (ApplicationManager.count > 0) {
176− ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
177− }
178175 finishStartUpTimer.start();
179176 }
180177
tests/mocks/Unity/Application/ApplicationManager.cpp−24
@@ -87,7 +87,6 @@ void ApplicationManager::onWindowCreatedTimerTimeout()
8787void ApplicationManager::onWindowCreated()
8888{
8989 startApplication("unity8-dash");
90− focusApplication("unity8-dash");
9190}
9291
9392int ApplicationManager::rowCount(const QModelIndex& parent) const {
@@ -269,9 +268,6 @@ bool ApplicationManager::stopApplication(const QString &appId)
269268 if (application == nullptr)
270269 return false;
271270
272− if (application->appId() == focusedApplicationId()) {
273− unfocusCurrentApplication();
274− }
275271 application->close();
276272 return true;
277273}
@@ -285,17 +281,6 @@ QString ApplicationManager::focusedApplicationId() const {
285281 return QString();
286282}
287283
288−bool ApplicationManager::focusApplication(const QString &appId)
289−{
290− ApplicationInfo *application = findApplication(appId);
291− if (application == nullptr)
292− return false;
293−
294− application->setFocused(true);
295−
296− return true;
297−}
298−
299284bool ApplicationManager::requestFocusApplication(const QString &appId)
300285{
301286 ApplicationInfo *application = findApplication(appId);
@@ -307,15 +292,6 @@ bool ApplicationManager::requestFocusApplication(const QString &appId)
307292 return true;
308293}
309294
310−void ApplicationManager::unfocusCurrentApplication()
311−{
312− for (ApplicationInfo *app : m_runningApplications) {
313− if (app->focused()) {
314− app->setFocused(false);
315− }
316− }
317−}
318−
319295void ApplicationManager::buildListOfAvailableApplications()
320296{
321297 /*
tests/mocks/Unity/Application/ApplicationManager.h−2
@@ -59,8 +59,6 @@ class ApplicationManager : public ApplicationManagerInterface {
5959
6060 // Application control methods
6161 Q_INVOKABLE bool requestFocusApplication(const QString &appId) override;
62− Q_INVOKABLE bool focusApplication(const QString &appId) override;
63− Q_INVOKABLE void unfocusCurrentApplication() override;
6462 Q_INVOKABLE ApplicationInfo *startApplication(const QString &appId, const QStringList &arguments = QStringList()) override;
6563 Q_INVOKABLE bool stopApplication(const QString &appId) override;
6664
tests/plugins/Unity/Launcher/launchermodeltest.cpp+1−3
@@ -107,7 +107,7 @@ public:
107107 }
108108 return false;
109109 }
110− bool focusApplication(const QString &appId) override {
110+ bool focusApplication(const QString &appId) {
111111 Q_FOREACH(MockApp* app, m_list) {
112112 app->setFocused(app->appId() == appId);
113113 }
@@ -115,8 +115,6 @@ public:
115115 return true;
116116 }
117117
118− void unfocusCurrentApplication() override { }
119−
120118 void addApplication(MockApp *app) {
121119 beginInsertRows(QModelIndex(), count(), count());
122120 m_list.append(app);