Merge lp:~unity-api-team/unity-scopes-shell/today-scope-crash into lp:unity-scopes-shell

[Pete Woods]

Fix today scope crash

Fix today scope crash

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:165
http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/4
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-armhf-ci/4/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-shell-vivid-i386-ci/4

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Yes, it definately makes sense! +1

review: Approve

[lp:~unity-api-team/unity-scopes-shell/today-scope-crash]

131. By Pete Woods on 2014-11-20

Fix thread affinity in GeoIp

132. By Pete Woods on 2014-11-20

Add destructor for Categories and clear data models

133. By Pete Woods on 2014-11-20

Explanation

Unmerged revisions

133. By Pete Woods on 2014-11-20

Explanation

132. By Pete Woods on 2014-11-20

Add destructor for Categories and clear data models

131. By Pete Woods on 2014-11-20

Fix thread affinity in GeoIp

130. By Paweł Stołowski on 2014-11-05

Merged trunk.

=== modified file 'src/Unity/categories.cpp'
--- src/Unity/categories.cpp	2014-08-05 23:33:32 +0000
+++ src/Unity/categories.cpp	2014-11-20 14:04:41 +0000
@@ -306,6 +306,12 @@
 {
 }
 
+Categories::~Categories()
+{
+    m_categories.clear();
+    m_categoryResults.clear();
+}
+
 int Categories::rowCount(const QModelIndex& parent) const
 {
     Q_UNUSED(parent);

=== modified file 'src/Unity/categories.h'
--- src/Unity/categories.h	2014-07-17 15:44:03 +0000
+++ src/Unity/categories.h	2014-11-20 14:04:41 +0000
@@ -43,6 +43,8 @@
 public:
     explicit Categories(QObject* parent = 0);
 
+    ~Categories();
+
     QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
     int rowCount(const QModelIndex& parent = QModelIndex()) const override;