diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-19 19:35:35 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2022-04-19 19:36:50 +0200 |
| commit | 254f3cc3684cdb7468e353596a89e8fe7a302b9b (patch) | |
| tree | 67c7d2239dc3a40a7fb90cdbf2a345d83d6594c2 | |
| parent | 37e49cc1b56b8e557d229ae0a1b8d5c60bdc1c4d (diff) | |
| parent | 6cf4dc7f64b42cbbff6a2ce7616ee625a87a29f5 (diff) | |
Merge bitcoin-core/gui#584: Getting ready to Qt 6 (5/n). Do not assume `qDBusRegisterMetaType` return type
6cf4dc7f64b42cbbff6a2ce7616ee625a87a29f5 qt: Do not assume `qDBusRegisterMetaType` return type (Hennadii Stepanov)
Pull request description:
`qDBusRegisterMetaType` returns:
- [`int`](https://doc.qt.io/qt-5/qdbusargument.html#qDBusRegisterMetaType) in Qt 5
- [`QMetaType`](https://doc.qt.io/qt-6/qdbusargument.html#qDBusRegisterMetaType) in Qt 6
ACKs for top commit:
laanwj:
Anyhow code review ACK 6cf4dc7f64b42cbbff6a2ce7616ee625a87a29f5
w0xlt:
tACK https://github.com/bitcoin-core/gui/pull/584/commits/6cf4dc7f64b42cbbff6a2ce7616ee625a87a29f5 on Ubuntu 21.10, Qt 5.15.2.
Tree-SHA512: 17d43e191d31a6f927d19550c52471ed3b9222f492a23cee2e553f2c679cf37125e00637b00ea9f4ee3e37dfcf5278171be9a5e1e2e899592516291c7b5cd942
| -rw-r--r-- | src/qt/notificator.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index b097ef080c..51151b0be8 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -14,8 +14,9 @@ #include <QTemporaryFile> #include <QVariant> #ifdef USE_DBUS -#include <stdint.h> +#include <QDBusMetaType> #include <QtDBus> +#include <stdint.h> #endif #ifdef Q_OS_MAC #include <qt/macnotificationhandler.h> @@ -73,8 +74,6 @@ public: FreedesktopImage() {} explicit FreedesktopImage(const QImage &img); - static int metaType(); - // Image to variant that can be marshalled over DBus static QVariant toVariant(const QImage &img); @@ -136,15 +135,10 @@ const QDBusArgument &operator>>(const QDBusArgument &a, FreedesktopImage &i) return a; } -int FreedesktopImage::metaType() -{ - return qDBusRegisterMetaType<FreedesktopImage>(); -} - QVariant FreedesktopImage::toVariant(const QImage &img) { FreedesktopImage fimg(img); - return QVariant(FreedesktopImage::metaType(), &fimg); + return QVariant(qDBusRegisterMetaType<FreedesktopImage>(), &fimg); } void Notificator::notifyDBus(Class cls, const QString &title, const QString &text, const QIcon &icon, int millisTimeout) |