From 4445c5e1cce89029c201f5e855b3211b8323b53e Mon Sep 17 00:00:00 2001 From: Gustavo Carneiro Date: Sun, 11 Oct 2020 23:03:20 -0300 Subject: [PATCH] Simplify CompositeWidgetFocusWatcher constructor. --- src/CompositeWidgetFocusWatcher.cpp | 4 ++-- src/CompositeWidgetFocusWatcher.h | 2 +- src/terminalDisplay/TerminalDisplay.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CompositeWidgetFocusWatcher.cpp b/src/CompositeWidgetFocusWatcher.cpp index a1d5053f..4e07f1bb 100644 --- a/src/CompositeWidgetFocusWatcher.cpp +++ b/src/CompositeWidgetFocusWatcher.cpp @@ -26,8 +26,8 @@ using namespace Konsole; -CompositeWidgetFocusWatcher::CompositeWidgetFocusWatcher(QWidget *compositeWidget, QObject *parent) - : QObject(parent) +CompositeWidgetFocusWatcher::CompositeWidgetFocusWatcher(QWidget *compositeWidget) + : QObject(compositeWidget) , _compositeWidget(compositeWidget) { registerWidgetAndChildren(compositeWidget); diff --git a/src/CompositeWidgetFocusWatcher.h b/src/CompositeWidgetFocusWatcher.h index 4e39f4e7..1a1546bf 100644 --- a/src/CompositeWidgetFocusWatcher.h +++ b/src/CompositeWidgetFocusWatcher.h @@ -37,7 +37,7 @@ class CompositeWidgetFocusWatcher : public QObject Q_OBJECT public: - explicit CompositeWidgetFocusWatcher(QWidget *compositeWidget, QObject *parent); + explicit CompositeWidgetFocusWatcher(QWidget *compositeWidget); bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; Q_SIGNALS: diff --git a/src/terminalDisplay/TerminalDisplay.cpp b/src/terminalDisplay/TerminalDisplay.cpp index 1a741e86..993065f1 100644 --- a/src/terminalDisplay/TerminalDisplay.cpp +++ b/src/terminalDisplay/TerminalDisplay.cpp @@ -564,7 +564,7 @@ TerminalDisplay::TerminalDisplay(QWidget* parent) new AutoScrollHandler(this); // Keep this last - CompositeWidgetFocusWatcher *focusWatcher = new CompositeWidgetFocusWatcher(this, this); + CompositeWidgetFocusWatcher *focusWatcher = new CompositeWidgetFocusWatcher(this); connect(focusWatcher, &CompositeWidgetFocusWatcher::compositeFocusChanged, this, [this](bool focused) {_hasCompositeFocus = focused;}); connect(focusWatcher, &CompositeWidgetFocusWatcher::compositeFocusChanged, -- GitLab