highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wladimir J. van der Laan
2011-09-24 11:56:33 +02:00
parent 99cec89cb3
commit 010c4fc0b5
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/qt/notificator.cpp
View File

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