From 4a9c2123b7fe9338ef710b868c9aa83ce232c134 Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Thu, 10 Sep 2015 12:44:14 +0200 Subject: [PATCH] Make constHints reuse hints(), set the hint for silent when hints are used and not when they are created. --- src/libsnore/application.cpp | 3 ++- src/libsnore/application_p.cpp | 1 - src/libsnore/notification/notification.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libsnore/application.cpp b/src/libsnore/application.cpp index fa261a1..1433f5b 100644 --- a/src/libsnore/application.cpp +++ b/src/libsnore/application.cpp @@ -91,12 +91,13 @@ bool Application::isValid() const Hint &Application::hints() { + d->m_hint.setValue("silent", SnoreCore::instance().settingsValue(QLatin1String("Silent"), LOCAL_SETTING)); return d->m_hint; } const Hint &Application::constHints() const { - return d->m_hint; + return const_cast(const_cast(this)->hints()); } QDebug operator<< (QDebug debug, const Snore::Application &app) diff --git a/src/libsnore/application_p.cpp b/src/libsnore/application_p.cpp index 2940d5b..833312e 100644 --- a/src/libsnore/application_p.cpp +++ b/src/libsnore/application_p.cpp @@ -34,7 +34,6 @@ ApplicationData::ApplicationData(const QString &key, const QString &name, const m_hint.setValue("pushover-token", QLatin1String("aFB1TPCyZkkr7mubCGEKy5vJEWak9t")); m_hint.setValue("use-markup", false); - m_hint.setValue("silent", SnoreCore::instance().settingsValue(QLatin1String("Silent"), LOCAL_SETTING)); } ApplicationData::~ApplicationData() diff --git a/src/libsnore/notification/notification.cpp b/src/libsnore/notification/notification.cpp index d2c09c4..f56c775 100644 --- a/src/libsnore/notification/notification.cpp +++ b/src/libsnore/notification/notification.cpp @@ -139,7 +139,7 @@ Hint &Notification::hints() const Hint &Notification::constHints() const { - return d->m_hints; + return const_cast(const_cast(this)->hints()); } bool Notification::isValid() const