Merge lp:~stolowski/unity-scopes-shell/fix-delete-later into lp:unity-scopes-shell

[Paweł Stołowski]

Fix signature of the deleteLater slot when scheduling scope for removal after un-favoriting.

Fix signature of the deleteLater slot when scheduling scope for removal after un-favoriting.

[Albert Astals Cid (aacid)]

Looks good, test passes with patch and not without.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:150
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/237/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-amd64-ci/134
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-armhf-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-utopic-i386-ci/137

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-shell-ci/237/rebuild

review: Approve (continuous-integration)

=== modified file 'src/Unity/scopes.cpp'
--- src/Unity/scopes.cpp	2014-09-10 11:47:01 +0000
+++ src/Unity/scopes.cpp	2014-09-29 14:27:13 +0000
@@ -276,7 +276,7 @@
                 (*it)->setFavorite(false);
                 //
                 // we need to delay actual deletion of Scope object so that shell can animate it
-                QTimer::singleShot(1000 * SCOPE_DELETE_DELAY, (*it), SLOT(deleteLater));
+                QTimer::singleShot(1000 * SCOPE_DELETE_DELAY, (*it), SLOT(deleteLater()));
                 it = m_scopes.erase(it);
                 endRemoveRows();
             }

=== modified file 'tests/favoritestest.cpp'
--- tests/favoritestest.cpp	2014-09-15 12:03:13 +0000
+++ tests/favoritestest.cpp	2014-09-29 14:27:13 +0000
@@ -100,12 +100,16 @@
 
         // unfavorite 1st scope
         QSignalSpy spy(scope1, SIGNAL(favoriteChanged(bool)));
+        QSignalSpy spy2(scope1, SIGNAL(destroyed(QObject *)));
         scope1->setFavorite(false);
         QTRY_COMPARE(spy.count(), 1);
         QTRY_COMPARE(m_scopes->rowCount(), 1);
         QVERIFY(m_scopes->getScopeById("mock-scope-departments") == nullptr);
         QCOMPARE(m_scopes->data(m_scopes->index(0), Scopes::RoleId), QVariant(QString("mock-scope-double-nav")));
 
+        // the scope should be destroyed after un-favoriting
+        QTRY_COMPARE(spy2.count(), 1);
+
         // favorite a scope
         auto overviewScope = m_scopes->overviewScope();
         QVERIFY(overviewScope != nullptr);