Merge lp:~knitzsche/scope-aggregator/scope-id_fixes-bug-1486184 into lp:scope-aggregator

[Kyle Nitzsche]

let's start using feature branches and MRs for scope-aggreagor

obtain the current scope id from Scope::start(scope_id), not by parsing the scope_directory() path.

[lp:~knitzsche/scope-aggregator/scope-id_fixes-bug-1486184]

147. By Kyle Nitzsche on 2015-08-18

just adding a --fixes arg to commit

148. By Kyle Nitzsche on 2015-08-18

suppress qDebug()

[Gary.Wang (gary-wzl77)]

Looks good to me.
Thanks.

review: Approve

[Kyle Nitzsche (knitzsche)]

Thanks Gary.

In future for simple MRs like this you can Top Approve too.

(I will do it this time.)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-08-04 19:12:04 +0000
+++ CMakeLists.txt	2015-08-18 18:49:11 +0000
@@ -1,4 +1,4 @@
-set(VERSION "1.5.24")
+set(VERSION "1.5.24.1")
 
 # Supress qDebug() output
 ADD_DEFINITIONS( -DQT_NO_DEBUG_OUTPUT )
 
=== modified file 'include/scope.h'
--- include/scope.h	2015-05-21 19:07:53 +0000
+++ include/scope.h	2015-08-18 18:49:11 +0000
@@ -47,6 +47,7 @@
 
     std::vector<std::string> get_declared_scopes(IdType) const;
     std::vector<std::string> get_declared_keywords() const;
+    std::string scope_id;
 
 };
 #endif
 
=== modified file 'src/query.cpp'
--- src/query.cpp	2015-08-04 19:12:04 +0000
+++ src/query.cpp	2015-08-18 18:49:11 +0000
@@ -43,8 +43,6 @@
 #include <QDebug>
 #include <QDateTime>
 
-QString CALL_ICON;
-
 namespace us = unity::scopes;
 using namespace std;
 
@@ -62,15 +60,7 @@
     agg_scope_(agg_scope)
 {
     setlocale(LC_ALL, "");
-    CALL_ICON = QString("%1/images/placed.png").arg(QString::fromStdString(scope_dir));
-
-    //there does not seem to be a method to get *this* scope id
-    //so I resort to hack of disassembling the scope path
-    QStringList tokens = QString::fromStdString(scope_dir_).split("/");
-    QString id = tokens[3];
-    QString app = tokens[5];
-    scope_id = (QString("%1_%2").arg(id,app)).toStdString();
-
+    scope_id = agg_scope_->scope_id;
 }
 
 Query::~Query()
 
=== modified file 'src/scope.cpp'
--- src/scope.cpp	2015-08-04 19:12:04 +0000
+++ src/scope.cpp	2015-08-18 18:49:11 +0000
@@ -41,6 +41,8 @@
 
 void AggScope::start(std::string const& scope_name)
 {
+    qDebug() <<"==== AggScope scope_name" << qstr(scope_name);
+    scope_id = scope_name;
 }
 
 void AggScope::stop()