Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Declare QDBusArgument for QImage in osddbus.h

Browse Source
This commit is contained in:
Jonas Kvinge 2020-08-23 03:19:40 +02:00
parent d74fc8d1ce
commit b5e27d4d69
5 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/mpris2.cpp
View File

@ -36,7 +36,6 @@
#include <QString>
#include <QStringList>
#include <QUrl>
#include <QImage>
#include <QDBusConnection>
#include <QDBusMessage>
#include <QDBusArgument>

4
src/core/mpris2.h
View File

@ -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 {

8
src/main.cpp
View File

@ -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

3
src/osd/osddbus.cpp
View File

@ -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()) {

4
src/osd/osddbus.h
View File

@ -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