diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-24 11:56:33 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-24 11:56:33 +0200 |
| commit | 010c4fc0b5ca8ceccf15417b833bea4ce1016f43 (patch) | |
| tree | 230414f6e233d2858da801c3e3fc22a59be0ef0f | |
| parent | 99cec89cb369beb8dce6c92db837bb5951f627d5 (diff) | |
| download | bitcoin-010c4fc0b5ca8ceccf15417b833bea4ce1016f43.tar.xz | |
Change define to determine use of DBUS to USE_DBUS, to prevent overlap with Qt-defined QT_DBUS
| -rw-r--r-- | bitcoin-qt.pro | 2 | ||||
| -rw-r--r-- | src/qt/notificator.cpp | 12 | ||||
| -rw-r--r-- | src/qt/notificator.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro index c7eb563bb4..3fff9ac908 100644 --- a/bitcoin-qt.pro +++ b/bitcoin-qt.pro @@ -23,7 +23,7 @@ count(USE_UPNP, 1) { # use: qmake "USE_DBUS=1" count(USE_DBUS, 1) { message(Building with DBUS (Freedesktop notifications) support) - DEFINES += QT_DBUS + DEFINES += USE_DBUS QT += dbus } diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 86ccfc8541..cf0c0a3901 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -9,7 +9,7 @@ #include <QSystemTrayIcon> #include <QMessageBox> -#ifdef QT_DBUS +#ifdef USE_DBUS #include <QtDBus/QtDBus> #include <stdint.h> #endif @@ -23,7 +23,7 @@ Notificator::Notificator(const QString &programName, QSystemTrayIcon *trayicon, programName(programName), mode(None), trayIcon(trayicon) -#ifdef QT_DBUS +#ifdef USE_DBUS ,interface(0) #endif { @@ -31,7 +31,7 @@ Notificator::Notificator(const QString &programName, QSystemTrayIcon *trayicon, { mode = QSystemTray; } -#ifdef QT_DBUS +#ifdef USE_DBUS interface = new QDBusInterface("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications"); if(interface->isValid()) @@ -43,12 +43,12 @@ Notificator::Notificator(const QString &programName, QSystemTrayIcon *trayicon, Notificator::~Notificator() { -#ifdef QT_DBUS +#ifdef USE_DBUS delete interface; #endif } -#ifdef QT_DBUS +#ifdef USE_DBUS // Loosely based on http://www.qtcentre.org/archive/index.php/t-25879.html class FreedesktopImage @@ -205,7 +205,7 @@ void Notificator::notify(Class cls, const QString &title, const QString &text, c { switch(mode) { -#ifdef QT_DBUS +#ifdef USE_DBUS case Freedesktop: notifyDBus(cls, title, text, icon, millisTimeout); break; diff --git a/src/qt/notificator.h b/src/qt/notificator.h index 13f6a908da..4217f7e06f 100644 --- a/src/qt/notificator.h +++ b/src/qt/notificator.h @@ -6,7 +6,7 @@ QT_BEGIN_NAMESPACE class QSystemTrayIcon; -#ifdef QT_DBUS +#ifdef USE_DBUS class QDBusInterface; #endif QT_END_NAMESPACE @@ -52,7 +52,7 @@ private: QString programName; Mode mode; QSystemTrayIcon *trayIcon; -#ifdef QT_DBUS +#ifdef USE_DBUS QDBusInterface *interface; void notifyDBus(Class cls, const QString &title, const QString &text, const QIcon &icon, int millisTimeout); |