Merge lp:~michihenning/unity-scopes-api/fix-qt-warnings into lp:unity-scopes-api

[Michi Henning]

Fixed a bunch of warnings caused by QVariant headers.
Restored spelling of Thomas Voß's surname.
Fixed test failure in RuntimeConfig caused by a change in the glib .ini parser from Utopic to Vidid. This allows the test to pass on both Utopic and Vivid.
Fixed a few clang warnings.

Fixed a bunch of warnings caused by QVariant headers.
Restored spelling of Thomas Voß's surname.
Fixed test failure in RuntimeConfig caused by a change in the glib .ini parser from Utopic to Vidid. This allows the test to pass on both Utopic and Vivid.
Fixed a few clang warnings.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:306
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/566/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/93
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/91/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/92

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

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/fix-qt-warnings]

307. By Michi Henning on 2015-02-09

Fixed a few clang warnings.

[Michi Henning (michihenning)]

I looked through this again, to see whether there is a more elegant way to deal with the Qt warnings (-Wctor-dtor-privacy). We could do this by adding another header that includes QtCore/QVariant.h protected by the #pragma, and then include that new header instead of having the repeated #pragma to suppress the warning wherever we include QtCore/QVariant.h.

The problem with doing this is that we need to include QtCore/QVariant.h in *public* headers, such as unity/scopes/qt/QResult.h. In turn, that would mean to have an artificial header among the public headers, so the hack becomes visible to the user. Once we have added a header file, we cannot remove that header again until the next API (not ABI!) break. In other words, adding such a header pollutes the public API.

On balance, I like the way it is now better (even though it is more verbose) because that keeps the crud in our code, instead of potentially ending up with crud in the customer's code (because they may accidentally include the work-around header we would otherwise have). In terms of maintenance burden, it really isn't a big deal. If the warning disappears in a future version of Qt, it's easy enough to strip out the #pragmas again (and the #pragmas don't do any harm even if we never remove them).

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:307
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/568/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/95
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/93
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/93/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/94

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

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

+1

review: Approve

=== modified file 'demo/client.cpp'
--- demo/client.cpp	2014-09-05 08:33:13 +0000
+++ demo/client.cpp	2015-02-09 02:24:15 +0000
@@ -257,7 +257,7 @@
         cout << "\tGot activation response: " << response.status() << endl;
     }
 
-    void finished(CompletionDetails const& details)
+    void finished(CompletionDetails const& details) override
     {
         cout << "\tActivation finished, status: " << to_string(details.status()) << ", message: " << details.message() << endl;
         lock_guard<decltype(mutex_)> lock(mutex_);

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h	2015-01-05 06:12:01 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h	2015-02-09 02:24:15 +0000
@@ -56,11 +56,11 @@
                    int64_t timeout = -1);
     virtual ~ZmqObjectProxy();
 
-    virtual ZmqMiddleware* mw_base() const noexcept;
+    virtual ZmqMiddleware* mw_base() const noexcept override;
 
     virtual std::string endpoint() const override;
     virtual std::string identity() const override;
-    std::string target_category() const;
+    std::string target_category() const override;
     RequestMode mode() const;
     virtual int64_t timeout() const noexcept override;
 

=== modified file 'include/unity/scopes/qt/QActionMetadata.h'
--- include/unity/scopes/qt/QActionMetadata.h	2015-01-26 15:25:30 +0000
+++ include/unity/scopes/qt/QActionMetadata.h	2015-02-09 02:24:15 +0000
@@ -19,7 +19,10 @@
 
 #include <unity/util/DefinesPtrs.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/QCannedQuery.h'
--- include/unity/scopes/qt/QCannedQuery.h	2015-01-20 13:59:36 +0000
+++ include/unity/scopes/qt/QCannedQuery.h	2015-02-09 02:24:15 +0000
@@ -22,7 +22,10 @@
 #include <unity/scopes/FilterState.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/QCategory.h'
--- include/unity/scopes/qt/QCategory.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/QCategory.h	2015-02-09 02:24:15 +0000
@@ -24,7 +24,10 @@
 #include <unity/scopes/Category.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 class QCategorisedResult_test;
 

=== modified file 'include/unity/scopes/qt/QColumnLayout.h'
--- include/unity/scopes/qt/QColumnLayout.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/QColumnLayout.h	2015-02-09 02:24:15 +0000
@@ -20,7 +20,10 @@
 
 #include <unity/util/DefinesPtrs.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 #include <QtCore/QVector>
 
 namespace unity

=== modified file 'include/unity/scopes/qt/QDepartment.h'
--- include/unity/scopes/qt/QDepartment.h	2015-01-20 13:59:36 +0000
+++ include/unity/scopes/qt/QDepartment.h	2015-02-09 02:24:15 +0000
@@ -20,7 +20,10 @@
 
 #include <unity/util/DefinesPtrs.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 #include <QtCore/QString>
 #include <QtCore/QSharedPointer>
 #include <QtCore/QScopedPointer>

=== modified file 'include/unity/scopes/qt/QPreviewReply.h'
--- include/unity/scopes/qt/QPreviewReply.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/QPreviewReply.h	2015-02-09 02:24:15 +0000
@@ -26,7 +26,10 @@
 #include <unity/scopes/qt/QColumnLayout.h>
 #include <unity/scopes/qt/QPreviewWidget.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 #include <QtCore/QObject>
 
 namespace unity

=== modified file 'include/unity/scopes/qt/QPreviewWidget.h'
--- include/unity/scopes/qt/QPreviewWidget.h	2015-01-26 09:27:05 +0000
+++ include/unity/scopes/qt/QPreviewWidget.h	2015-02-09 02:24:15 +0000
@@ -21,7 +21,10 @@
 #include <unity/util/NonCopyable.h>
 #include <unity/util/DefinesPtrs.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/QResult.h'
--- include/unity/scopes/qt/QResult.h	2015-01-26 15:25:30 +0000
+++ include/unity/scopes/qt/QResult.h	2015-02-09 02:24:15 +0000
@@ -23,7 +23,10 @@
 #include <unity/scopes/ScopeProxyFwd.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/QScopeBaseAPI.h'
--- include/unity/scopes/qt/QScopeBaseAPI.h	2015-01-29 10:32:59 +0000
+++ include/unity/scopes/qt/QScopeBaseAPI.h	2015-02-09 02:24:15 +0000
@@ -75,7 +75,7 @@
 
     \param scope_id The name of the scope as defined by the scope's configuration file.
     */
-    virtual void start(std::string const& scope_id);
+    virtual void start(std::string const& scope_id) override;
 
     /**
     \brief Called by the scopes run time when the scope should shut down.
@@ -88,7 +88,7 @@
 
     The call to stop() is made by the same thread that calls the create function and start().
     */
-    virtual void stop();
+    virtual void stop() override;
 
     /**
      * Called each time a new preview is requested

=== modified file 'include/unity/scopes/qt/QSearchMetadata.h'
--- include/unity/scopes/qt/QSearchMetadata.h	2015-01-26 15:25:30 +0000
+++ include/unity/scopes/qt/QSearchMetadata.h	2015-02-09 02:24:15 +0000
@@ -22,7 +22,10 @@
 #include <unity/scopes/Location.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/QUtils.h'
--- include/unity/scopes/qt/QUtils.h	2015-01-20 13:59:36 +0000
+++ include/unity/scopes/qt/QUtils.h	2015-02-09 02:24:15 +0000
@@ -18,7 +18,10 @@
 
 #pragma once
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 #include <unity/scopes/Variant.h>
 
 #define EXPORT __attribute__((visibility("default")))

=== modified file 'include/unity/scopes/qt/QVariantBuilder.h'
--- include/unity/scopes/qt/QVariantBuilder.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/QVariantBuilder.h	2015-02-09 02:24:15 +0000
@@ -20,7 +20,10 @@
 
 #include <QtCore/QPair>
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 #include <QtCore/QVector>
 
 #include <memory>

=== modified file 'include/unity/scopes/qt/internal/QActionMetadataImpl.h'
--- include/unity/scopes/qt/internal/QActionMetadataImpl.h	2015-01-26 15:25:30 +0000
+++ include/unity/scopes/qt/internal/QActionMetadataImpl.h	2015-02-09 02:24:15 +0000
@@ -19,7 +19,10 @@
 
 #include <unity/util/DefinesPtrs.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/internal/QCannedQueryImpl.h'
--- include/unity/scopes/qt/internal/QCannedQueryImpl.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/internal/QCannedQueryImpl.h	2015-02-09 02:24:15 +0000
@@ -22,7 +22,10 @@
 #include <unity/scopes/FilterState.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/internal/QCategoryImpl.h'
--- include/unity/scopes/qt/internal/QCategoryImpl.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/internal/QCategoryImpl.h	2015-02-09 02:24:15 +0000
@@ -24,7 +24,10 @@
 #include <unity/scopes/Category.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/internal/QColumnLayoutImpl.h'
--- include/unity/scopes/qt/internal/QColumnLayoutImpl.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/internal/QColumnLayoutImpl.h	2015-02-09 02:24:15 +0000
@@ -22,7 +22,10 @@
 
 #include <unity/util/DefinesPtrs.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 #include <QtCore/QVector>
 
 namespace unity

=== modified file 'include/unity/scopes/qt/internal/QPreviewReplyImpl.h'
--- include/unity/scopes/qt/internal/QPreviewReplyImpl.h	2015-02-02 07:46:12 +0000
+++ include/unity/scopes/qt/internal/QPreviewReplyImpl.h	2015-02-09 02:24:15 +0000
@@ -27,7 +27,10 @@
 #include <unity/scopes/qt/QColumnLayout.h>
 #include <unity/scopes/qt/QPreviewWidget.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/internal/QPreviewWidgetImpl.h'
--- include/unity/scopes/qt/internal/QPreviewWidgetImpl.h	2015-01-20 14:14:26 +0000
+++ include/unity/scopes/qt/internal/QPreviewWidgetImpl.h	2015-02-09 02:24:15 +0000
@@ -21,7 +21,10 @@
 #include <unity/util/NonCopyable.h>
 #include <unity/util/DefinesPtrs.h>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/internal/QResultImpl.h'
--- include/unity/scopes/qt/internal/QResultImpl.h	2015-01-26 15:25:30 +0000
+++ include/unity/scopes/qt/internal/QResultImpl.h	2015-02-09 02:24:15 +0000
@@ -23,7 +23,10 @@
 #include <unity/scopes/ScopeProxyFwd.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 
 class QVariant;
 

=== modified file 'include/unity/scopes/qt/internal/QScopeVariant.h'
--- include/unity/scopes/qt/internal/QScopeVariant.h	2015-01-26 15:25:30 +0000
+++ include/unity/scopes/qt/internal/QScopeVariant.h	2015-02-09 02:24:15 +0000
@@ -18,7 +18,10 @@
 
 #pragma once
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariantMap>
+#pragma GCC diagnostic pop
 #include <QtCore/QString>
 
 namespace unity

=== modified file 'include/unity/scopes/qt/internal/QSearchMetadataImpl.h'
--- include/unity/scopes/qt/internal/QSearchMetadataImpl.h	2015-01-26 15:25:30 +0000
+++ include/unity/scopes/qt/internal/QSearchMetadataImpl.h	2015-02-09 02:24:15 +0000
@@ -22,7 +22,10 @@
 #include <unity/scopes/Location.h>
 
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 
 namespace unity
 {

=== modified file 'include/unity/scopes/qt/internal/QVariantBuilderImpl.h'
--- include/unity/scopes/qt/internal/QVariantBuilderImpl.h	2015-01-26 14:13:31 +0000
+++ include/unity/scopes/qt/internal/QVariantBuilderImpl.h	2015-02-09 02:24:15 +0000
@@ -22,7 +22,10 @@
 
 #include <QtCore/QPair>
 #include <QtCore/QString>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>
+#pragma GCC diagnostic pop
 #include <QtCore/QVector>
 
 #include <memory>

=== modified file 'include/unity/scopes/testing/Benchmark.h'
--- include/unity/scopes/testing/Benchmark.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/Benchmark.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/Category.h'
--- include/unity/scopes/testing/Category.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/Category.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/InProcessBenchmark.h'
--- include/unity/scopes/testing/InProcessBenchmark.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/InProcessBenchmark.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/MockPreviewReply.h'
--- include/unity/scopes/testing/MockPreviewReply.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/MockPreviewReply.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/MockRegistry.h'
--- include/unity/scopes/testing/MockRegistry.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/MockRegistry.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/MockSearchReply.h'
--- include/unity/scopes/testing/MockSearchReply.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/MockSearchReply.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/OutOfProcessBenchmark.h'
--- include/unity/scopes/testing/OutOfProcessBenchmark.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/OutOfProcessBenchmark.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/Result.h'
--- include/unity/scopes/testing/Result.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/Result.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/ScopeMetadataBuilder.h'
--- include/unity/scopes/testing/ScopeMetadataBuilder.h	2015-02-05 14:57:01 +0000
+++ include/unity/scopes/testing/ScopeMetadataBuilder.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/Statistics.h'
--- include/unity/scopes/testing/Statistics.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/Statistics.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'include/unity/scopes/testing/TypedScopeFixture.h'
--- include/unity/scopes/testing/TypedScopeFixture.h	2015-02-04 20:57:38 +0000
+++ include/unity/scopes/testing/TypedScopeFixture.h	2015-02-09 02:24:15 +0000
@@ -13,7 +13,7 @@
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * Authored by: Thomas Voss <[e-mail]>
+ * Authored by: Thomas Voß <[e-mail]>
  */
 
 #pragma once

=== modified file 'test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp'
--- test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2015-01-09 03:16:51 +0000
+++ test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp	2015-02-09 02:24:15 +0000
@@ -23,6 +23,8 @@
 
 #include <unity/UnityExceptions.h>
 
+#include <boost/regex.hpp>  // Use Boost implementation until http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631 is fixed.
+
 #include <gtest/gtest.h>
 
 using namespace std;
@@ -230,12 +232,15 @@
     }
     catch (ConfigException const& e)
     {
-        EXPECT_STREQ( "unity::scopes::ConfigException: \"" TEST_SRC_DIR "/NoLogDir.ini\": "
-                      "No LogDir configured and failed to get default:\n"
-                      "    unity::ResourceException: RuntimeConfig::default_log_directory(): $HOME not set:\n"
-                      "        unity::LogicException: Could not get string value (" TEST_SRC_DIR "/NoLogDir.ini, "
-                      "group: Runtime): Key file does not have key 'LogDir' in group 'Runtime'",
-                     e.what());
+        // Using regex here because error message returned by glib changed from Utopic to Vivid.
+        // The final .* takes care of the difference. Note that, instead of using TEST_SRC_DIR, we
+        // use .+. That's because, when building with bzr bd, we end up with a '+' in the path,
+        // and that is a regex metacharacter, causing the match to fail.
+        boost::regex r("unity::scopes::ConfigException: \".+/NoLogDir.ini\": "
+                       "No LogDir configured and failed to get default:\\n"
+                       "    unity::ResourceException: RuntimeConfig::default_log_directory\\(\\): \\$HOME not set:\\n"
+                       "        unity::LogicException: Could not get string value \\(.+/NoLogDir.ini, .*");
+        EXPECT_TRUE(boost::regex_match(e.what(), r)) << e.what();
     }
 
     try

=== modified file 'test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp'
--- test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2015-01-26 08:20:45 +0000
+++ test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp	2015-02-09 02:24:15 +0000
@@ -431,7 +431,7 @@
     virtual MWQueryCtrlProxy activate(Result const&,
                                       ActionMetadata const&,
                                       MWReplyProxy const&,
-                                      InvokeInfo const&)
+                                      InvokeInfo const&) override
     {
         return nullptr;
     }

=== modified file 'test/gtest/scopes/testing/IsolatedScope/scope.h'
--- test/gtest/scopes/testing/IsolatedScope/scope.h	2015-02-04 20:57:38 +0000
+++ test/gtest/scopes/testing/IsolatedScope/scope.h	2015-02-09 02:24:15 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: James Henstridge <[e-mail]>
- *              Thomas Voss <[e-mail]>
+ *              Thomas Voß <[e-mail]>
  */
 
 #include <unity/scopes/ScopeBase.h>

=== modified file 'test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h'
--- test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h	2015-02-04 20:57:38 +0000
+++ test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h	2015-02-09 02:24:15 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: James Henstridge <[e-mail]>
- *              Thomas Voss <[e-mail]>
+ *              Thomas Voß <[e-mail]>
  */
 
 #include <unity/scopes/ScopeBase.h>