diff --git a/src/blackmisc/dbus.cpp b/src/blackmisc/dbus.cpp index 3943323a2..8d87e2bba 100644 --- a/src/blackmisc/dbus.cpp +++ b/src/blackmisc/dbus.cpp @@ -13,16 +13,19 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QPixmap &pixmap) { QByteArray ba; + argument.beginStructure(); argument >> ba; BlackMisc::pngByteArrayToPixmapRef(ba, pixmap); + argument.endStructure(); return argument; } - QDBusArgument &operator<<(QDBusArgument &argument, const QPixmap &pixmap) { QByteArray ba; BlackMisc::pixmapToPngByteArray(pixmap, ba); + argument.beginStructure(); argument << ba; + argument.endStructure(); return argument; } diff --git a/src/blackmisc/threadedreader.h b/src/blackmisc/threadedreader.h index f7cb2d1ea..c35498758 100644 --- a/src/blackmisc/threadedreader.h +++ b/src/blackmisc/threadedreader.h @@ -13,6 +13,7 @@ //! \file #include "blackmiscexport.h" +#include "blackmisc/network/entityflags.h" #include "worker.h" #include #include @@ -62,9 +63,8 @@ namespace BlackMisc CThreadedReader(QObject *owner, const QString &name); QTimer *m_updateTimer = nullptr; //!< update timer - bool m_shutdown = false; //!< in shutdown process - - mutable QReadWriteLock m_lock {QReadWriteLock::Recursive}; //!< lock + bool m_shutdown = false; //!< in shutdown process + mutable QReadWriteLock m_lock {QReadWriteLock::Recursive}; //!< lock which can be used from the derived classes //! Make sure everthing runs correctly in own thread void threadAssertCheck() const;