From b5e27d4d693cf5392f1c16f749af57d9957e0b3a Mon Sep 17 00:00:00 2001
From: Jonas Kvinge <jonas@jkvinge.net>
Date: Sun, 23 Aug 2020 03:19:40 +0200
Subject: [PATCH] Declare QDBusArgument for QImage in osddbus.h

---
 src/core/mpris2.cpp | 5 ++---
 src/core/mpris2.h   | 4 ----
 src/main.cpp        | 8 --------
 src/osd/osddbus.cpp | 3 ---
 src/osd/osddbus.h   | 4 ++++
 5 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/core/mpris2.cpp b/src/core/mpris2.cpp
index c0894bb59..6c34b49cd 100644
--- a/src/core/mpris2.cpp
+++ b/src/core/mpris2.cpp
@@ -36,7 +36,6 @@
 #include <QString>
 #include <QStringList>
 #include <QUrl>
-#include <QImage>
 #include <QDBusConnection>
 #include <QDBusMessage>
 #include <QDBusArgument>
@@ -72,7 +71,7 @@ QDBusArgument &operator<<(QDBusArgument &arg, const MprisPlaylist &playlist) {
   return arg;
 }
 
-const QDBusArgument &operator>> (const QDBusArgument &arg, MprisPlaylist &playlist) {
+const QDBusArgument &operator>>(const QDBusArgument &arg, MprisPlaylist &playlist) {
   arg.beginStructure();
   arg >> playlist.id >> playlist.name >> playlist.icon;
   arg.endStructure();
@@ -87,7 +86,7 @@ QDBusArgument &operator<<(QDBusArgument &arg, const MaybePlaylist &playlist) {
   return arg;
 }
 
-const QDBusArgument &operator>> (const QDBusArgument &arg, MaybePlaylist &playlist) {
+const QDBusArgument &operator>>(const QDBusArgument &arg, MaybePlaylist &playlist) {
   arg.beginStructure();
   arg >> playlist.valid >> playlist.playlist;
   arg.endStructure();
diff --git a/src/core/mpris2.h b/src/core/mpris2.h
index f7e419633..516ba8747 100644
--- a/src/core/mpris2.h
+++ b/src/core/mpris2.h
@@ -32,7 +32,6 @@
 #include <QVariant>
 #include <QString>
 #include <QStringList>
-#include <QImage>
 #include <QtDBus>
 #include <QDBusArgument>
 #include <qdbusextratypes.h>
@@ -70,9 +69,6 @@ const QDBusArgument &operator>> (const QDBusArgument &arg, MprisPlaylist &playli
 QDBusArgument &operator<<(QDBusArgument &arg, const MaybePlaylist &playlist);
 const QDBusArgument &operator>> (const QDBusArgument &arg, MaybePlaylist &playlist);
 
-QDBusArgument &operator<< (QDBusArgument &arg, const QImage &image);
-const QDBusArgument &operator>> (const QDBusArgument &arg, QImage &image);
-
 namespace mpris {
 
 class Mpris2 : public QObject {
diff --git a/src/main.cpp b/src/main.cpp
index 96a7321f2..3530e6b45 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -63,9 +63,6 @@
 #include <QSettings>
 #include <QLoggingCategory>
 #include <QtDebug>
-#ifdef HAVE_DBUS
-#  include <QDBusArgument>
-#endif
 #ifdef HAVE_TRANSLATIONS
 #  include <QTranslator>
 #endif
@@ -110,11 +107,6 @@
 #  include "osd/osdbase.h"
 #endif
 
-#ifdef HAVE_DBUS
-  QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image);
-  const QDBusArgument &operator>>(const QDBusArgument &arg, QImage &image);
-#endif
-
 int main(int argc, char* argv[]) {
 
 #ifdef Q_OS_MACOS
diff --git a/src/osd/osddbus.cpp b/src/osd/osddbus.cpp
index 454d58da4..ef6394b8b 100644
--- a/src/osd/osddbus.cpp
+++ b/src/osd/osddbus.cpp
@@ -47,9 +47,6 @@
 #include "core/logging.h"
 #include "osddbus.h"
 
-QDBusArgument &operator<< (QDBusArgument &arg, const QImage &image);
-const QDBusArgument &operator>> (const QDBusArgument &arg, QImage &image);
-
 QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image) {
 
   if (image.isNull()) {
diff --git a/src/osd/osddbus.h b/src/osd/osddbus.h
index cb38df648..d9da2d370 100644
--- a/src/osd/osddbus.h
+++ b/src/osd/osddbus.h
@@ -32,6 +32,7 @@
 #include <QDateTime>
 #include <QImage>
 #include <QDBusPendingCall>
+#include <QDBusArgument>
 
 #include "osdbase.h"
 
@@ -67,4 +68,7 @@ class OSDDBus : public OSDBase {
 
 };
 
+QDBusArgument &operator<<(QDBusArgument &arg, const QImage &image);
+const QDBusArgument &operator>>(const QDBusArgument &arg, QImage &image);
+
 #endif  // OSDDBUS_H