Browse Source

Change define to determine use of DBUS to USE_DBUS, to prevent overlap with Qt-defined QT_DBUS

pull/1/head
Wladimir J. van der Laan 11 years ago
parent
commit
010c4fc0b5
  1. 2
      bitcoin-qt.pro
  2. 12
      src/qt/notificator.cpp
  3. 4
      src/qt/notificator.h

2
bitcoin-qt.pro

@ -23,7 +23,7 @@ count(USE_UPNP, 1) { @@ -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
}

12
src/qt/notificator.cpp

@ -9,7 +9,7 @@ @@ -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, @@ -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, @@ -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, @@ -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 @@ -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;

4
src/qt/notificator.h

@ -6,7 +6,7 @@ @@ -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: @@ -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);

Loading…
Cancel
Save