From a6d79e8468b6c516745002876bbe52f3963031a3 Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Sun, 4 Apr 2021 13:13:24 +0200
Subject: Move glib includes outside of extern "C"

Recent glib versions throw this error otherwise:

In file included from /usr/include/glib-2.0/glib/gatomic.h:31,
                 from /usr/include/glib-2.0/glib/gthread.h:32,
                 from /usr/include/glib-2.0/glib/gasyncqueue.h:32,
                 from /usr/include/glib-2.0/glib.h:32,
                 from /home/pmos/build/src/qmenumodel-0.8.0/libqmenumodel/src/converter.cpp:22:
/usr/include/c++/10.2.1/type_traits:56:3: error: template with C linkage
   56 |   template<typename _Tp, _Tp __v>
      |   ^~~~~~~~
/home/pmos/build/src/qmenumodel-0.8.0/libqmenumodel/src/converter.cpp:21:1: note: 'extern "C"' linkage started here
   21 | extern "C" {
      | ^~~~~~~~~~
---
 tests/client/cachetest.cpp        | 2 --
 tests/client/convertertest.cpp    | 2 --
 tests/client/modelsignalstest.cpp | 2 --
 tests/client/modeltest.cpp        | 2 --
 tests/client/qmltest.cpp          | 2 --
 tests/client/treetest.cpp         | 2 --
 6 files changed, 12 deletions(-)

(limited to 'tests')

diff --git a/tests/client/cachetest.cpp b/tests/client/cachetest.cpp
index 8ad65af..188020a 100644
--- a/tests/client/cachetest.cpp
+++ b/tests/client/cachetest.cpp
@@ -20,9 +20,7 @@
 
 #include "qmenumodel.h"
 
-extern "C" {
 #include <gio/gio.h>
-}
 
 #include <QtTest>
 
diff --git a/tests/client/convertertest.cpp b/tests/client/convertertest.cpp
index 43127a7..095a022 100644
--- a/tests/client/convertertest.cpp
+++ b/tests/client/convertertest.cpp
@@ -18,9 +18,7 @@
  *      Marco Trevisan <marco.trevisan@canonical.com>
  */
 
-extern "C" {
 #include <glib.h>
-}
 
 #include "converter.h"
 
diff --git a/tests/client/modelsignalstest.cpp b/tests/client/modelsignalstest.cpp
index 3064778..fe28932 100644
--- a/tests/client/modelsignalstest.cpp
+++ b/tests/client/modelsignalstest.cpp
@@ -23,9 +23,7 @@
 #include <QtTest>
 #include <QDebug>
 
-extern "C" {
 #include <gio/gio.h>
-}
 
 
 class MenuModelTestClass : public QMenuModel
diff --git a/tests/client/modeltest.cpp b/tests/client/modeltest.cpp
index 7bc9706..e6ae82d 100644
--- a/tests/client/modeltest.cpp
+++ b/tests/client/modeltest.cpp
@@ -25,9 +25,7 @@
 #include <QtTest>
 #include <QDebug>
 
-extern "C" {
 #include <gio/gio.h>
-}
 
 class ModelTest : public QObject
 {
diff --git a/tests/client/qmltest.cpp b/tests/client/qmltest.cpp
index 1f1e494..94080df 100644
--- a/tests/client/qmltest.cpp
+++ b/tests/client/qmltest.cpp
@@ -17,9 +17,7 @@
  *      Renato Araujo Oliveira Filho <renato@canonical.com>
  */
 
-extern "C" {
 #include <glib-object.h>
-}
 
 #include "qdbusmenumodel.h"
 #include "dbusmenuscript.h"
diff --git a/tests/client/treetest.cpp b/tests/client/treetest.cpp
index 3c2827b..baa1554 100644
--- a/tests/client/treetest.cpp
+++ b/tests/client/treetest.cpp
@@ -20,9 +20,7 @@
 
 #include "qmenumodel.h"
 
-extern "C" {
 #include <gio/gio.h>
-}
 
 #include <QtTest>
 
-- 
cgit v1.2.3