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" {
      | ^~~~~~~~~~
---
 libqmenumodel/src/converter.cpp            | 2 --
 libqmenumodel/src/menunode.h               | 2 --
 libqmenumodel/src/qdbusactiongroup.cpp     | 2 --
 libqmenumodel/src/qdbusmenumodel.cpp       | 2 --
 libqmenumodel/src/qdbusobject.cpp          | 2 --
 libqmenumodel/src/qmenumodel.cpp           | 2 --
 libqmenumodel/src/qmenumodelevents.cpp     | 2 --
 libqmenumodel/src/unitymenumodelevents.cpp | 2 --
 8 files changed, 16 deletions(-)

(limited to 'libqmenumodel')

diff --git a/libqmenumodel/src/converter.cpp b/libqmenumodel/src/converter.cpp
index 459e77f..49ced63 100644
--- a/libqmenumodel/src/converter.cpp
+++ b/libqmenumodel/src/converter.cpp
@@ -18,9 +18,7 @@
  *      Marco Trevisan <marco.trevisan@canonical.com>
  */
 
-extern "C" {
 #include <glib.h>
-}
 
 #include "converter.h"
 
diff --git a/libqmenumodel/src/menunode.h b/libqmenumodel/src/menunode.h
index e647a37..8c27111 100644
--- a/libqmenumodel/src/menunode.h
+++ b/libqmenumodel/src/menunode.h
@@ -25,9 +25,7 @@
 #include <QMap>
 #include <QVariant>
 
-extern "C" {
 #include <gio/gio.h>
-}
 
 class MenuNode
 {
diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp
index 76e28ed..edbb073 100644
--- a/libqmenumodel/src/qdbusactiongroup.cpp
+++ b/libqmenumodel/src/qdbusactiongroup.cpp
@@ -26,10 +26,8 @@
 // Qt
 #include <QCoreApplication>
 
-extern "C" {
 #include <glib.h>
 #include <gio/gio.h>
-}
 
 /*!
     \qmltype QDBusActionGroup
diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp
index f8b4a51..207584e 100644
--- a/libqmenumodel/src/qdbusmenumodel.cpp
+++ b/libqmenumodel/src/qdbusmenumodel.cpp
@@ -17,9 +17,7 @@
  *      Renato Araujo Oliveira Filho <renato@canonical.com>
  */
 
-extern "C" {
 #include <gio/gio.h>
-}
 
 #include "qdbusmenumodel.h"
 #include "qmenumodelevents.h"
diff --git a/libqmenumodel/src/qdbusobject.cpp b/libqmenumodel/src/qdbusobject.cpp
index fab2df7..c440009 100644
--- a/libqmenumodel/src/qdbusobject.cpp
+++ b/libqmenumodel/src/qdbusobject.cpp
@@ -17,10 +17,8 @@
  *      Renato Araujo Oliveira Filho <renato@canonical.com>
  */
 
-extern "C" {
 #include <glib-object.h>
 #include <gio/gio.h>
-}
 
 #include "qdbusobject.h"
 #include "qmenumodelevents.h"
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp
index e77419f..7b720ae 100644
--- a/libqmenumodel/src/qmenumodel.cpp
+++ b/libqmenumodel/src/qmenumodel.cpp
@@ -18,9 +18,7 @@
  *      Olivier Tilloy <olivier.tilloy@canonical.com>
  */
 
-extern "C" {
 #include <gio/gio.h>
-}
 
 #include "qmenumodel.h"
 #include "menunode.h"
diff --git a/libqmenumodel/src/qmenumodelevents.cpp b/libqmenumodel/src/qmenumodelevents.cpp
index c705d5c..f5c6485 100644
--- a/libqmenumodel/src/qmenumodelevents.cpp
+++ b/libqmenumodel/src/qmenumodelevents.cpp
@@ -17,10 +17,8 @@
  *      Nicholas Dedekind <nick.dedekind@canonical.com
  */
 
-extern "C" {
 #include <glib-object.h>
 #include <gio/gio.h>
-}
 
 #include "qmenumodelevents.h"
 
diff --git a/libqmenumodel/src/unitymenumodelevents.cpp b/libqmenumodel/src/unitymenumodelevents.cpp
index 68dacde..46a9517 100644
--- a/libqmenumodel/src/unitymenumodelevents.cpp
+++ b/libqmenumodel/src/unitymenumodelevents.cpp
@@ -17,10 +17,8 @@
  *      Nicholas Dedekind <nick.dedekind@canonical.com
  */
 
-extern "C" {
 #include <glib-object.h>
 #include <gio/gio.h>
-}
 
 #include "unitymenumodelevents.h"
 #include "unitymenumodel.h"
-- 
cgit v1.2.3