Ignore -Wcpp for gtest.h/gmock.h

tests/src/collectionbackend_test.cpp

@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QFileInfo>
 #include <QSignalSpy>

tests/src/collectionmodel_test.cpp

@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QMap>
 #include <QString>

tests/src/concurrentrun_test.cpp

@@ -1,6 +1,6 @@
 #include <functional>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QtConcurrentRun>
 #include <QThreadPool>

tests/src/gmock_include.h

@@ -0,0 +1,8 @@
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcpp"
+#endif
+#include <gmock/gmock.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif

tests/src/gtest_include.h

@@ -0,0 +1,8 @@
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcpp"
+#endif
+#include <gtest/gtest.h>
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif

tests/src/logging_env.h

@@ -21,7 +21,7 @@
 #ifndef LOGGING_ENV_H
 #define LOGGING_ENV_H
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include "core/logging.h"
 

tests/src/main.cpp

@@ -18,7 +18,7 @@
  *
  */
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #ifdef GUI
 #  include <QApplication>

tests/src/mergedproxymodel_test.cpp

@@ -19,7 +19,8 @@
  */
 
 
-#include "gtest/gtest.h"
+#include "gtest_include.h"
+
 #include "test_utils.h"
 #include "core/mergedproxymodel.h"
 

tests/src/metatypes_env.h

@@ -21,7 +21,7 @@
 #ifndef METATYPES_ENV_H
 #define METATYPES_ENV_H
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QMetaType>
 #include <QModelIndex>

tests/src/mock_collectionbackend.h

@@ -21,7 +21,7 @@
 #ifndef MOCKCOLLECTIONBACKEND_H
 #define MOCKCOLLECTIONBACKEND_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include "collection/collectionbackend.h"
 

tests/src/mock_networkaccessmanager.h

@@ -21,7 +21,7 @@
 #ifndef MOCK_NETWORKACCESSMANAGER_H
 #define MOCK_NETWORKACCESSMANAGER_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include <QtGlobal>
 #include <QMap>

tests/src/mock_playlistitem.h

@@ -21,7 +21,7 @@
 #ifndef MOCK_PLAYLISTITEM_H
 #define MOCK_PLAYLISTITEM_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include <QVariant>
 #include <QUrl>

tests/src/mock_settingsprovider.h

@@ -21,7 +21,7 @@
 #ifndef MOCK_SETTINGSPROVIDER_H
 #define MOCK_SETTINGSPROVIDER_H
 
-#include <gmock/gmock.h>
+#include "gmock_include.h"
 
 #include "core/settingsprovider.h"
 

tests/src/mutex_protected_test.cpp

@@ -1,4 +1,4 @@
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include "includes/mutex_protected.h"
 

tests/src/organizeformat_test.cpp

@@ -19,7 +19,8 @@
  *
  */
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
+
 #include "test_utils.h"
 
 #include "constants/timeconstants.h"

tests/src/playlist_test.cpp

@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include "test_utils.h"
 

tests/src/resources_env.h

@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QResource>
 

tests/src/songplaylistitem_test.cpp

@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QTemporaryFile>
 #include <QFileInfo>

tests/src/sqlite_test.cpp

@@ -1,4 +1,5 @@
-#include <gtest/gtest.h>
+#include "gtest_include.h"
+
 #include <sqlite3.h>
 
 // clazy:excludeall=returning-void-expression

tests/src/tagreader_test.cpp

@@ -19,8 +19,8 @@
 
 #include "config.h"
 
-#include <gmock/gmock.h>
-#include <gtest/gtest.h>
+#include "gtest_include.h"
+#include "gmock_include.h"
 
 #include <QFile>
 #include <QByteArray>

tests/src/utilities_test.cpp

@@ -19,7 +19,7 @@
  *
  */
 
-#include <gtest/gtest.h>
+#include "gtest_include.h"
 
 #include <QByteArray>
 #include <QString>