Merge lp:~michihenning/thumbnailer/fix-warnings into lp:thumbnailer/devel

[Michi Henning]

Fixed a bunch of compiler warnings on zesty.

Fixed a bunch of compiler warnings on zesty.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:366
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1415
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1422
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1200/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1200
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1200/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-ci/13/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.canonical.com/unity-api-1/job/lp-thumbnailer-autoland/120/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1508/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1515
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1293/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1293/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1293/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1293/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1293/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1293
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1293/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

review: Approve (continuous-integration)

=== modified file 'doc/libthumbnailer-qt/examples/qt_example_test.cpp'
--- doc/libthumbnailer-qt/examples/qt_example_test.cpp	2016-09-23 01:39:55 +0000
+++ doc/libthumbnailer-qt/examples/qt_example_test.cpp	2017-01-17 04:15:24 +0000
@@ -115,7 +115,11 @@
 #include <QTemporaryDir>
 
 #include <boost/filesystem.hpp>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
 #include <memory>
 
 
=== modified file 'include/internal/image.h'
--- include/internal/image.h	2016-03-02 04:10:45 +0000
+++ include/internal/image.h	2017-01-17 04:15:24 +0000
@@ -61,7 +61,7 @@
 
     // Return the pixel value at the (x,y) coordinates as an integer:
     //     r << 24 | g << 16 | b << 8 | a
-    int pixel(int x, int y) const;
+    uint32_t pixel(int x, int y) const;
 
     // Return a scaled version of the image that fits within the given
     // requested size.
 
=== modified file 'src/image.cpp'
--- src/image.cpp	2016-02-29 07:04:54 +0000
+++ src/image.cpp	2017-01-17 04:15:24 +0000
@@ -430,7 +430,7 @@
     return h;
 }
 
-int Image::pixel(int x, int y) const
+uint32_t Image::pixel(int x, int y) const
 {
     assert(gdk_pixbuf_get_colorspace(pixbuf_.get()) == GDK_COLORSPACE_RGB);
     assert(gdk_pixbuf_get_bits_per_sample(pixbuf_.get()) == 8);
 
=== modified file 'tests/art_extractor/art_extractor_test.cpp'
--- tests/art_extractor/art_extractor_test.cpp	2016-02-09 04:09:37 +0000
+++ tests/art_extractor/art_extractor_test.cpp	2017-01-17 04:15:24 +0000
@@ -23,7 +23,7 @@
 #include <boost/algorithm/string.hpp>
 
 #include <testsetup.h>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 #define AIFF_FILE TESTDATADIR "/testsong.aiff"
 #define FLAC_FILE TESTDATADIR "/testsong.flac"
 
=== modified file 'tests/backoff_adjuster/backoff_adjuster_test.cpp'
--- tests/backoff_adjuster/backoff_adjuster_test.cpp	2016-01-04 06:09:41 +0000
+++ tests/backoff_adjuster/backoff_adjuster_test.cpp	2017-01-17 04:15:24 +0000
@@ -18,7 +18,7 @@
 
 #include <internal/backoff_adjuster.h>
 
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 #include <thread>
 
 
=== modified file 'tests/check_access/check_access_test.cpp'
--- tests/check_access/check_access_test.cpp	2015-06-24 01:08:06 +0000
+++ tests/check_access/check_access_test.cpp	2017-01-17 04:15:24 +0000
@@ -18,7 +18,7 @@
 
 #include <internal/check_access.h>
 
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <testsetup.h>
 
 #include <cstdio>
 
=== modified file 'tests/dbus/dbus_test.cpp'
--- tests/dbus/dbus_test.cpp	2016-09-26 00:30:42 +0000
+++ tests/dbus/dbus_test.cpp	2017-01-17 04:15:24 +0000
@@ -25,7 +25,7 @@
 #include "utils/env_var_guard.h"
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <QProcess>
 #include <QSignalSpy>
 #include <QTemporaryDir>
@@ -423,7 +423,7 @@
     {
         CacheStats s = reply.value().full_size_stats;
         EXPECT_EQ(temp_dir() + "/cache/unity-thumbnailer/images", s.cache_path.toStdString());
-        EXPECT_EQ(1, s.policy);
+        EXPECT_EQ(1u, s.policy);
         EXPECT_EQ(0, s.size);
         EXPECT_EQ(0, s.size_in_bytes);
         EXPECT_NE(0, s.max_size_in_bytes);
@@ -444,21 +444,21 @@
         auto list = s.histogram;
         for (auto c : list)
         {
-            EXPECT_EQ(0, c);
+            EXPECT_EQ(0u, c);
         }
     }
 
     {
         CacheStats s = reply.value().thumbnail_stats;
         EXPECT_EQ(temp_dir() + "/cache/unity-thumbnailer/thumbnails", s.cache_path.toStdString());
-        EXPECT_EQ(1, s.policy);
+        EXPECT_EQ(1u, s.policy);
         EXPECT_EQ(0, s.size);
     }
 
     {
         CacheStats s = reply.value().failure_stats;
         EXPECT_EQ(temp_dir() + "/cache/unity-thumbnailer/failures", s.cache_path.toStdString());
-        EXPECT_EQ(0, s.policy);
+        EXPECT_EQ(0u, s.policy);
         EXPECT_EQ(0, s.size);
     }
 
 
=== modified file 'tests/download/download_test.cpp'
--- tests/download/download_test.cpp	2015-12-28 05:05:23 +0000
+++ tests/download/download_test.cpp	2017-01-17 04:15:24 +0000
@@ -22,7 +22,7 @@
 #include "utils/artserver.h"
 #include <testsetup.h>
 
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 #include <QSignalSpy>
 #include <QUrl>
 
=== modified file 'tests/file_io/file_io_test.cpp'
--- tests/file_io/file_io_test.cpp	2015-11-30 06:55:46 +0000
+++ tests/file_io/file_io_test.cpp	2017-01-17 04:15:24 +0000
@@ -19,7 +19,7 @@
 #include <internal/file_io.h>
 
 #include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <testsetup.h>
 
 #include <fcntl.h>
@@ -34,7 +34,7 @@
     ASSERT_NE(-1, stat(in_file.c_str(), &st));
 
     string data = read_file(in_file);
-    ASSERT_EQ(st.st_size, data.size());
+    ASSERT_EQ(unsigned(st.st_size), data.size());
 
     string out_file = TESTBINDIR "/testimage.jpg";
     write_file(out_file, data);
 
=== modified file 'tests/file_lock/file_lock_test.cpp'
--- tests/file_lock/file_lock_test.cpp	2016-01-09 04:25:19 +0000
+++ tests/file_lock/file_lock_test.cpp	2017-01-17 04:15:24 +0000
@@ -20,7 +20,7 @@
 
 #include <unity/UnityExceptions.h>
 
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 using namespace std;
 using namespace unity::thumbnailer::internal;
 
=== added file 'tests/gmock_nowarn.h'
--- tests/gmock_nowarn.h	1970-01-01 00:00:00 +0000
+++ tests/gmock_nowarn.h	2017-01-17 04:15:24 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2017 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <gmock/gmock.h>
+#pragma GCC diagnostic pop
 
=== modified file 'tests/gobj_ptr/gobj_ptr_test.cpp'
--- tests/gobj_ptr/gobj_ptr_test.cpp	2015-11-13 04:36:08 +0000
+++ tests/gobj_ptr/gobj_ptr_test.cpp	2017-01-17 04:15:24 +0000
@@ -22,7 +22,7 @@
 
 #include <internal/gobj_memory.h>
 #include <glib-object.h>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 using namespace std;
 using namespace unity::thumbnailer::internal;
@@ -87,17 +87,17 @@
 TEST(Gobj_ptr, refcount)
 {
     GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
-    EXPECT_EQ(1, o->ref_count);
+    EXPECT_EQ(1u, o->ref_count);
     g_object_ref(o);
 
     {
-        EXPECT_EQ(2, o->ref_count);
+        EXPECT_EQ(2u, o->ref_count);
         gobj_ptr<GObject> u(o);
-        EXPECT_EQ(2, o->ref_count);
+        EXPECT_EQ(2u, o->ref_count);
         // Now it dies and refcount is reduced.
     }
 
-    EXPECT_EQ(1, o->ref_count);
+    EXPECT_EQ(1u, o->ref_count);
     g_object_unref(o);
 }
 
@@ -105,14 +105,14 @@
 {
     GObject* o = G_OBJECT(g_object_new(G_TYPE_OBJECT, nullptr));
     gobj_ptr<GObject> u(o);
-    EXPECT_EQ(1, u->ref_count);
+    EXPECT_EQ(1u, u->ref_count);
     gobj_ptr<GObject> u2(u);
-    EXPECT_EQ(2, u->ref_count);
+    EXPECT_EQ(2u, u->ref_count);
     gobj_ptr<GObject> u3 = u2;
-    EXPECT_EQ(3, u->ref_count);
+    EXPECT_EQ(3u, u->ref_count);
     u3.reset();
     u2.reset();
-    EXPECT_EQ(1, u->ref_count);
+    EXPECT_EQ(1u, u->ref_count);
 }
 
 TEST(Gobj_ptr, swap)
 
=== added file 'tests/gtest_nowarn.h'
--- tests/gtest_nowarn.h	1970-01-01 00:00:00 +0000
+++ tests/gtest_nowarn.h	2017-01-17 04:15:24 +0000
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2017 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * 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/>.
+ *
+ * Authors: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <gtest/gtest.h>
+#pragma GCC diagnostic pop
 
=== modified file 'tests/image-provider/image-provider_test.cpp'
--- tests/image-provider/image-provider_test.cpp	2016-09-26 00:30:42 +0000
+++ tests/image-provider/image-provider_test.cpp	2017-01-17 04:15:24 +0000
@@ -27,7 +27,7 @@
 #include "utils/dbusserver.h"
 #include "utils/testutils.h"
 
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <QGuiApplication>
 #include <QImage>
 #include <QQuickImageProvider>
 
=== modified file 'tests/image/image_test.cpp'
--- tests/image/image_test.cpp	2016-02-29 07:04:54 +0000
+++ tests/image/image_test.cpp	2017-01-17 04:15:24 +0000
@@ -19,7 +19,7 @@
 #include <internal/image.h>
 
 #include <boost/algorithm/string.hpp>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
@@ -53,8 +53,8 @@
         EXPECT_EQ(480, i.height());
         EXPECT_EQ(0xFE0000FF, i.pixel(0, 0));
         EXPECT_EQ(0xFFFF00FF, i.pixel(639, 0));
-        EXPECT_EQ(0x00FF01FF, i.pixel(639, 479));
-        EXPECT_EQ(0x0000FEFF, i.pixel(0, 479));
+        EXPECT_EQ(0x00FF01FFu, i.pixel(639, 479));
+        EXPECT_EQ(0x0000FEFFu, i.pixel(0, 479));
         EXPECT_FALSE(i.has_alpha());
 
         // Move constructor
@@ -251,8 +251,8 @@
         EXPECT_EQ(150, img.height());
         EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
         EXPECT_EQ(0xFFFF00FF, img.pixel(199, 0));
-        EXPECT_EQ(0x00FF01FF, img.pixel(199, 149));
-        EXPECT_EQ(0x0000FEFF, img.pixel(0, 149));
+        EXPECT_EQ(0x00FF01FFu, img.pixel(199, 149));
+        EXPECT_EQ(0x0000FEFFu, img.pixel(0, 149));
     }
 }
 
@@ -267,8 +267,8 @@
         EXPECT_EQ(480, img.height());
         EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
         EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
-        EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
-        EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
+        EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
+        EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
 
         // Scaled version
         img = Image(data, QSize(320, 240));
@@ -276,8 +276,8 @@
         EXPECT_EQ(240, img.height());
         EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
         EXPECT_EQ(0xFFFF00FF, img.pixel(319, 0));
-        EXPECT_EQ(0x00FF01FF, img.pixel(319, 239));
-        EXPECT_EQ(0x0000FEFF, img.pixel(0, 239));
+        EXPECT_EQ(0x00FF01FFu, img.pixel(319, 239));
+        EXPECT_EQ(0x0000FEFFu, img.pixel(0, 239));
 
         // This version will be produced from the thumbnail, which has
         // been tinted to distinguish it from the original.
@@ -448,7 +448,7 @@
     Image img(fd.get(), QSize(400, 400));
     EXPECT_EQ(200, img.width());
     EXPECT_EQ(200, img.height());
-    EXPECT_EQ(0x0, img.pixel(0, 0));
+    EXPECT_EQ(0x0u, img.pixel(0, 0));
     EXPECT_EQ(0xFF0000FF, img.pixel(100, 100));
     EXPECT_TRUE(img.has_alpha());
 }
@@ -461,7 +461,7 @@
     Image img(fd.get(), QSize());
     EXPECT_EQ(200, img.width());
     EXPECT_EQ(200, img.height());
-    EXPECT_EQ(0x0, img.pixel(0, 0));
+    EXPECT_EQ(0x0u, img.pixel(0, 0));
     EXPECT_EQ(0xFF0000FF, img.pixel(100, 100));
     EXPECT_TRUE(img.has_alpha());
 }
@@ -474,7 +474,7 @@
     Image img(fd.get(), QSize(400, 400));
     EXPECT_EQ(200, img.width());
     EXPECT_EQ(200, img.height());
-    EXPECT_EQ(0x0, img.pixel(0, 0));
+    EXPECT_EQ(0x0u, img.pixel(0, 0));
     EXPECT_EQ(0xFF0000FF, img.pixel(100, 100));
     EXPECT_TRUE(img.has_alpha());
 }
 
=== modified file 'tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp'
--- tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp	2016-09-26 00:30:42 +0000
+++ tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp	2017-01-17 04:15:24 +0000
@@ -43,7 +43,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 #include <QSignalSpy>
 #include <QTemporaryDir>
 
=== modified file 'tests/recovery/MockCache.h'
--- tests/recovery/MockCache.h	2015-09-01 08:05:02 +0000
+++ tests/recovery/MockCache.h	2017-01-17 04:15:24 +0000
@@ -22,7 +22,7 @@
 #include <core/optional.h>
 #include <core/persistent_cache_stats.h>
 
-#include <gmock/gmock.h>
+#include <gmock_nowarn.h>
 
 #include <chrono>
 #include <system_error>
 
=== modified file 'tests/safe_strerror/safe_strerror_test.cpp'
--- tests/safe_strerror/safe_strerror_test.cpp	2015-11-13 04:36:08 +0000
+++ tests/safe_strerror/safe_strerror_test.cpp	2017-01-17 04:15:24 +0000
@@ -17,7 +17,7 @@
  */
 
 #include <internal/safe_strerror.h>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 using namespace unity::thumbnailer::internal;
 
 
=== modified file 'tests/settings/settings_test.cpp'
--- tests/settings/settings_test.cpp	2016-01-11 07:33:57 +0000
+++ tests/settings/settings_test.cpp	2017-01-17 04:15:24 +0000
@@ -27,7 +27,7 @@
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #include <gio/gio.h>
 #pragma GCC diagnostic pop
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <QTemporaryDir>
 
 #include <unistd.h>
 
=== modified file 'tests/slow-vs-thumb/slow-vs-thumb_test.cpp'
--- tests/slow-vs-thumb/slow-vs-thumb_test.cpp	2016-09-26 00:50:50 +0000
+++ tests/slow-vs-thumb/slow-vs-thumb_test.cpp	2017-01-17 04:15:24 +0000
@@ -22,7 +22,7 @@
 #include <testsetup.h>
 
 #include <boost/filesystem.hpp>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <QSignalSpy>
 #include <QTemporaryDir>
 #include <unity/UnityExceptions.h>
 
=== modified file 'tests/stress/stress_test.cpp'
--- tests/stress/stress_test.cpp	2016-09-26 00:30:42 +0000
+++ tests/stress/stress_test.cpp	2017-01-17 04:15:24 +0000
@@ -40,7 +40,7 @@
 #pragma GCC diagnostic pop
 
 #include <boost/filesystem.hpp>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <QSignalSpy>
 #include <QTemporaryDir>
 
 
=== modified file 'tests/thumbnailer-admin/thumbnailer-admin_test.cpp'
--- tests/thumbnailer-admin/thumbnailer-admin_test.cpp	2016-02-29 09:07:16 +0000
+++ tests/thumbnailer-admin/thumbnailer-admin_test.cpp	2017-01-17 04:15:24 +0000
@@ -25,7 +25,7 @@
 #include <testsetup.h>
 
 #include <boost/algorithm/string/predicate.hpp>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 using namespace std;
 using namespace boost;
@@ -434,8 +434,8 @@
     EXPECT_EQ(480, img.height());
     EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
     EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
-    EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
-    EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
+    EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
+    EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
 }
 
 TEST_F(AdminTest, get_large_thumbnail)
@@ -452,8 +452,8 @@
     EXPECT_EQ(240, img.height());
     EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
     EXPECT_EQ(0xFFFF00FF, img.pixel(319, 0));
-    EXPECT_EQ(0x00FF01FF, img.pixel(319, 239));
-    EXPECT_EQ(0x0000FEFF, img.pixel(0, 239));
+    EXPECT_EQ(0x00FF01FFu, img.pixel(319, 239));
+    EXPECT_EQ(0x0000FEFFu, img.pixel(0, 239));
 }
 
 TEST_F(AdminTest, get_small_thumbnail_square)
@@ -539,7 +539,7 @@
     Image img(data);
     EXPECT_EQ(200, img.width());
     EXPECT_EQ(200, img.height());
-    EXPECT_EQ(0, img.pixel(0, 0));
+    EXPECT_EQ(0u, img.pixel(0, 0));
 }
 
 TEST_F(AdminTest, get_png_no_alpha)
@@ -572,8 +572,8 @@
     EXPECT_EQ(480, img.height());
     EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
     EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
-    EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
-    EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
+    EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
+    EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
 }
 
 TEST_F(AdminTest, get_with_relative_input_path)
@@ -591,8 +591,8 @@
     EXPECT_EQ(480, img.height());
     EXPECT_EQ(0xFE0000FF, img.pixel(0, 0));
     EXPECT_EQ(0xFFFF00FF, img.pixel(639, 0));
-    EXPECT_EQ(0x00FF01FF, img.pixel(639, 479));
-    EXPECT_EQ(0x0000FEFF, img.pixel(0, 479));
+    EXPECT_EQ(0x00FF01FFu, img.pixel(639, 479));
+    EXPECT_EQ(0x0000FEFFu, img.pixel(0, 479));
 }
 
 TEST_F(AdminTest, empty_input_path)
 
=== modified file 'tests/thumbnailer/thumbnailer_test.cpp'
--- tests/thumbnailer/thumbnailer_test.cpp	2016-11-11 06:43:10 +0000
+++ tests/thumbnailer/thumbnailer_test.cpp	2017-01-17 04:15:24 +0000
@@ -34,7 +34,7 @@
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #include <gio/gio.h>
 #pragma GCC diagnostic pop
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <QCoreApplication>
 #include <QSignalSpy>
 #include <QTemporaryDir>
 
=== modified file 'tests/version/version_test.cpp'
--- tests/version/version_test.cpp	2016-02-25 06:05:42 +0000
+++ tests/version/version_test.cpp	2017-01-17 04:15:24 +0000
@@ -19,7 +19,7 @@
 #include <internal/version.h>
 
 #include <testsetup.h>
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 
 using namespace std;
 using namespace unity::thumbnailer::internal;
 
=== modified file 'tests/vs-thumb/vs-thumb_test.cpp'
--- tests/vs-thumb/vs-thumb_test.cpp	2016-03-21 02:08:39 +0000
+++ tests/vs-thumb/vs-thumb_test.cpp	2017-01-17 04:15:24 +0000
@@ -40,7 +40,7 @@
 #pragma clang diagnostic pop
 #endif
 #pragma GCC diagnostic pop
-#include <gtest/gtest.h>
+#include <gtest_nowarn.h>
 #include <QUrl>
 
 #include <cstdio>