Merge lp:~tiagosh/address-book-service/close-view-asynchronously into lp:address-book-service

Proposed by Tiago Salem Herrmann
Status: Merged
Merged at revision: 162
Proposed branch: lp:~tiagosh/address-book-service/close-view-asynchronously
Merge into: lp:address-book-service
Diff against target: 34 lines (+3/-3)
2 files modified
contacts/qcontactfetchrequest-data.cpp (+2/-2)
lib/view.cpp (+1/-1)
To merge this branch: bzr merge lp:~tiagosh/address-book-service/close-view-asynchronously
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+270559@code.launchpad.net

Commit message

Close views asynchronously.

Description of the change

Close views asynchronously.

To post a comment you must log in.
161. By Tiago Salem Herrmann

use deleteLater() instead of delete

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contacts/qcontactfetchrequest-data.cpp'
2--- contacts/qcontactfetchrequest-data.cpp 2014-07-11 13:11:19 +0000
3+++ contacts/qcontactfetchrequest-data.cpp 2015-09-09 17:45:29 +0000
4@@ -41,7 +41,7 @@
5
6 QContactFetchRequestData::~QContactFetchRequestData()
7 {
8- delete m_runningParser;
9+ m_runningParser->deleteLater();
10 }
11
12 int QContactFetchRequestData::offset() const
13@@ -134,7 +134,7 @@
14 void QContactFetchRequestData::deleteView(QDBusInterface *view)
15 {
16 if (view) {
17- view->call("close");
18+ view->asyncCall("close");
19 view->deleteLater();
20 }
21 }
22
23=== modified file 'lib/view.cpp'
24--- lib/view.cpp 2014-10-15 18:53:34 +0000
25+++ lib/view.cpp 2015-09-09 17:45:29 +0000
26@@ -196,7 +196,7 @@
27 m_filterThread->stop();
28 m_filterThread->wait();
29 }
30- delete m_filterThread;
31+ m_filterThread->deleteLater();
32 m_filterThread = 0;
33 }
34 }

Subscribers

People subscribed via source and target branches