From 6bfa260800588318e5a7b17e3b9dbfaa67bba635 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 5 Sep 2018 21:09:19 +0200 Subject: [PATCH] clang-tidy: Avoid another bogus warning about a potential leak False positive, fixed by assigning to an attribute. Seems like clang-tidy really doesn't like ephemeral objects even if they have a parent. --- src/qtui/statusnotifieritem.cpp | 10 +++++----- src/qtui/statusnotifieritem.h | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp index 48c747e1..59a129ea 100644 --- a/src/qtui/statusnotifieritem.cpp +++ b/src/qtui/statusnotifieritem.cpp @@ -113,11 +113,11 @@ StatusNotifierItem::StatusNotifierItem(QWidget *parent) connect(this, SIGNAL(toolTipChanged(QString, QString)), _statusNotifierItemDBus, SIGNAL(NewToolTip())); // Service watcher to keep track of the StatusNotifierWatcher service - QDBusServiceWatcher *watcher = new QDBusServiceWatcher(kSniWatcherService, - QDBusConnection::sessionBus(), - QDBusServiceWatcher::WatchForOwnerChange, - this); - connect(watcher, SIGNAL(serviceOwnerChanged(QString, QString, QString)), SLOT(serviceChange(QString, QString, QString))); + _serviceWatcher = new QDBusServiceWatcher(kSniWatcherService, + QDBusConnection::sessionBus(), + QDBusServiceWatcher::WatchForOwnerChange, + this); + connect(_serviceWatcher, SIGNAL(serviceOwnerChanged(QString, QString, QString)), SLOT(serviceChange(QString, QString, QString))); // Client instance for StatusNotifierWatcher _statusNotifierWatcher = new org::kde::StatusNotifierWatcher(kSniWatcherService, diff --git a/src/qtui/statusnotifieritem.h b/src/qtui/statusnotifieritem.h index 8b8eb96f..8e40be37 100644 --- a/src/qtui/statusnotifieritem.h +++ b/src/qtui/statusnotifieritem.h @@ -44,6 +44,8 @@ # include "legacysystemtray.h" #endif +class QDBusServiceWatcher; + class StatusNotifierItemDBus; class StatusNotifierItem : public StatusNotifierItemParent @@ -87,6 +89,7 @@ private slots: private: void registerToWatcher(); + QDBusServiceWatcher *_serviceWatcher{nullptr}; StatusNotifierItemDBus *_statusNotifierItemDBus{nullptr}; org::kde::StatusNotifierWatcher *_statusNotifierWatcher{nullptr}; org::freedesktop::Notifications *_notificationsClient{nullptr}; -- 2.20.1