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

List:       kde-commits
Subject:    [sprinter/gko/master] sprinter: fix signal/slot connection (needs to be fully namespaced)
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2014-03-06 10:20:20
Message-ID: E1WLVPY-0007ZS-4z () scm ! kde ! org
[Download RAW message or body]

Git commit 979e350c7f77d0d3a48fe555ee4ce2c5c15751b4 by Aaron J. Seigo.
Committed on 25/02/2014 at 16:27.
Pushed by aseigo into branch 'gko/master'.

fix signal/slot connection (needs to be fully namespaced)

M  +3    -3    sprinter/querysession.cpp
M  +1    -1    sprinter/querysession.h
M  +1    -1    sprinter/querysession_p.h
M  +1    -1    sprinter/querysessionthread_p.h

http://commits.kde.org/sprinter/979e350c7f77d0d3a48fe555ee4ce2c5c15751b4

diff --git a/sprinter/querysession.cpp b/sprinter/querysession.cpp
index d03db69..cb74f95 100644
--- a/sprinter/querysession.cpp
+++ b/sprinter/querysession.cpp
@@ -116,7 +116,7 @@ void QuerySession::Private::matchesArrived()
     }
 }
 
-void QuerySession::Private::executionFinished(const QueryMatch &match, bool success)
+void QuerySession::Private::executionFinished(const Sprinter::QueryMatch &match, bool success)
 {
     // remove the match from the list of matches being executed
     QMutableHashIterator<int, QueryMatch> it(executingMatches);
@@ -217,8 +217,8 @@ void QuerySession::executeMatch(int index)
     d->executingMatches.insert(index, match);
     d->matchesUpdated(index, index);
     ExecRunnable *exec = new ExecRunnable(match);
-    connect(exec, SIGNAL(finished(QueryMatch,bool)),
-            this, SLOT(executionFinished(QueryMatch,bool)));
+    connect(exec, SIGNAL(finished(Sprinter::QueryMatch,bool)),
+            this, SLOT(executionFinished(Sprinter::QueryMatch,bool)));
     QThreadPool::globalInstance()->start(exec);
 }
 
diff --git a/sprinter/querysession.h b/sprinter/querysession.h
index b6f1d69..4495659 100644
--- a/sprinter/querysession.h
+++ b/sprinter/querysession.h
@@ -276,7 +276,7 @@ private:
 
     Q_PRIVATE_SLOT(d, void startMatchSynchronization());
     Q_PRIVATE_SLOT(d, void resetModel());
-    Q_PRIVATE_SLOT(d, void executionFinished(const QueryMatch &match, bool success));
+    Q_PRIVATE_SLOT(d, void executionFinished(const Sprinter::QueryMatch &match, bool success));
 };
 
 } // namespace
diff --git a/sprinter/querysession_p.h b/sprinter/querysession_p.h
index 16a76f5..a5540f9 100644
--- a/sprinter/querysession_p.h
+++ b/sprinter/querysession_p.h
@@ -39,7 +39,7 @@ public:
     void matchesUpdated(int start, int end);
     void matchesArrived();
     void resetModel();
-    void executionFinished(const QueryMatch &match, bool success);
+    void executionFinished(const Sprinter::QueryMatch &match, bool success);
     void startMatchSynchronization();
 
     QuerySession *q;
diff --git a/sprinter/querysessionthread_p.h b/sprinter/querysessionthread_p.h
index e6823ce..b76e229 100644
--- a/sprinter/querysessionthread_p.h
+++ b/sprinter/querysessionthread_p.h
@@ -192,7 +192,7 @@ public:
     void run();
 
 Q_SIGNALS:
-    void finished(const QueryMatch &match, bool success);
+    void finished(const Sprinter::QueryMatch &match, bool success);
 
 private:
     QueryMatch m_match;

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