[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sprinter/gko/master] sprinter: cleanups
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2014-03-06 10:20:21
Message-ID: E1WLVPZ-0007ZS-JZ () scm ! kde ! org
[Download RAW message or body]

Git commit 685c7eecd4fafdc620a7c5b96b21291b9eb54d09 by Aaron J. Seigo.
Committed on 25/02/2014 at 20:18.
Pushed by aseigo into branch 'gko/master'.

cleanups

M  +8    -3    sprinter/querysessionthread_p.cpp
M  +0    -2    sprinter/querysessionthread_p.h

http://commits.kde.org/sprinter/685c7eecd4fafdc620a7c5b96b21291b9eb54d09

diff --git a/sprinter/querysessionthread_p.cpp b/sprinter/querysessionthread_p.cpp
index 85e8bab..fd1c662 100644
--- a/sprinter/querysessionthread_p.cpp
+++ b/sprinter/querysessionthread_p.cpp
@@ -415,6 +415,8 @@ void QuerySessionThread::startMatching()
 
 void QuerySessionThread::launchDefaultMatches()
 {
+    CHECK_IS_GUI_THREAD
+
     m_context.setFetchMore(false);
     m_context.setIsDefaultMatchesRequest(true);
     startQuery();
@@ -422,6 +424,8 @@ void QuerySessionThread::launchDefaultMatches()
 
 bool QuerySessionThread::launchQuery(const QString &query)
 {
+    CHECK_IS_GUI_THREAD
+
     const QString oldQuery = m_context.query();
     m_context.setQuery(query);
     if (m_context.query() == oldQuery) {
@@ -435,13 +439,14 @@ bool QuerySessionThread::launchQuery(const QString &query)
 
 void QuerySessionThread::launchMoreMatches()
 {
-     m_context.setFetchMore(true);
-     startQuery(m_currentRunner == m_runnerBookmark);
+    CHECK_IS_GUI_THREAD
+
+    m_context.setFetchMore(true);
+    startQuery(m_currentRunner == m_runnerBookmark);
 }
 
 void QuerySessionThread::startQuery(bool clearMatchers)
 {
-    CHECK_IS_GUI_THREAD
     qDebug() << m_context.query()
              << (m_context.fetchMore() ? "Fetching more." : "")
              << (m_context.isDefaultMatchesRequest() ? "Default matches." : "")
diff --git a/sprinter/querysessionthread_p.h b/sprinter/querysessionthread_p.h
index b76e229..9b33a87 100644
--- a/sprinter/querysessionthread_p.h
+++ b/sprinter/querysessionthread_p.h
@@ -90,8 +90,6 @@ public:
     ~QuerySessionThread();
 
     // in worker thread
-public:
-
 public Q_SLOTS:
     void loadRunnerMetaData();
     void loadRunner(int index);

[prev in list] [next in list] [prev in thread] [next in thread]