Move CompositeWidgetFocusWatcher class to a new file.

src/CMakeLists.txt

@@ -107,6 +107,7 @@ set(konsoleprivate_SRCS ${sessionadaptors_SRCS}
                         PrintOptions.cpp
                         WindowSystemInfo.cpp
                         CharacterWidth.cpp
+                        CompositeWidgetFocusWatcher.cpp
                         ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Window.xml
                         ${CMAKE_CURRENT_BINARY_DIR}/org.kde.konsole.Session.xml)
 

src/CompositeWidgetFocusWatcher.cpp

@@ -0,0 +1,69 @@
+/*
+    This file is part of Konsole, a terminal emulator for KDE.
+
+    Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
+    Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301  USA.
+*/
+
+#include "CompositeWidgetFocusWatcher.h"
+
+#include <QFocusEvent>
+
+using namespace Konsole;
+
+CompositeWidgetFocusWatcher::CompositeWidgetFocusWatcher(QWidget *compositeWidget, QObject *parent)
+    : QObject(parent)
+    , _compositeWidget(compositeWidget)
+{
+    registerWidgetAndChildren(compositeWidget);
+}
+
+bool CompositeWidgetFocusWatcher::eventFilter(QObject *watched, QEvent *event)
+{
+    Q_UNUSED(watched)
+
+    auto *focusEvent = static_cast<QFocusEvent *>(event);
+    switch(event->type()) {
+    case QEvent::FocusIn:
+        emit compositeFocusChanged(true);
+        break;
+    case QEvent::FocusOut:
+        if(focusEvent->reason() != Qt::PopupFocusReason) {
+            emit compositeFocusChanged(false);
+        }
+        break;
+    default:
+        break;
+    }
+    return false;
+}
+
+void CompositeWidgetFocusWatcher::registerWidgetAndChildren(QWidget *widget)
+{
+    Q_ASSERT(widget != nullptr);
+
+    if (widget->focusPolicy() != Qt::NoFocus) {
+        widget->installEventFilter(this);
+    }
+    for (auto *child: widget->children()) {
+        auto *childWidget = qobject_cast<QWidget *>(child);
+        if (childWidget != nullptr) {
+            registerWidgetAndChildren(childWidget);
+        }
+    }
+}

src/CompositeWidgetFocusWatcher.h

@@ -0,0 +1,54 @@
+/*
+    This file is part of Konsole, a terminal emulator for KDE.
+
+    Copyright 2006-2008 by Robert Knight <robertknight@gmail.com>
+    Copyright 1997,1998 by Lars Doelle <lars.doelle@on-line.de>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301  USA.
+*/
+
+#ifndef COMPOSITEWIDGET_H
+#define COMPOSITEWIDGET_H
+
+#include <QWidget>
+
+namespace Konsole
+{
+// Watches compositeWidget and all its focusable children,
+// and emits focusChanged() signal when either compositeWidget's
+// or a child's focus changed.
+// Limitation: children added after the object was created
+// will not be registered.
+class CompositeWidgetFocusWatcher : public QObject
+{
+    Q_OBJECT
+
+public:
+    explicit CompositeWidgetFocusWatcher(QWidget *compositeWidget, QObject *parent);
+    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
+
+Q_SIGNALS:
+    void compositeFocusChanged(bool focused);
+
+private:
+    void registerWidgetAndChildren(QWidget *widget);
+
+    QWidget *_compositeWidget;
+};
+
+} // namespace Konsole
+
+#endif // COMPOSITEWIDGET_H

src/widgets/TerminalDisplay.cpp

@@ -59,6 +59,7 @@
 #include <KIO/StatJob>
 
 // Konsole
+#include "CompositeWidgetFocusWatcher.h"
 #include "Filter.h"
 #include "konsoledebug.h"
 #include "TerminalCharacterDecoder.h"
@@ -4177,49 +4178,3 @@ void TerminalDisplay::applyProfile(const Profile::Ptr &profile)
     _mouseWheelZoom = profile->mouseWheelZoomEnabled();
     setAlternateScrolling(profile->property<bool>(Profile::AlternateScrolling));
 }
-
-//
-// CompositeWidgetFocusWatcher
-//
-
-CompositeWidgetFocusWatcher::CompositeWidgetFocusWatcher(QWidget *compositeWidget, QObject *parent)
-    : QObject(parent)
-    , _compositeWidget(compositeWidget)
-{
-    registerWidgetAndChildren(compositeWidget);
-}
-
-bool CompositeWidgetFocusWatcher::eventFilter(QObject *watched, QEvent *event)
-{
-    Q_UNUSED(watched)
-
-    auto *focusEvent = static_cast<QFocusEvent *>(event);
-    switch(event->type()) {
-    case QEvent::FocusIn:
-        emit compositeFocusChanged(true);
-        break;
-    case QEvent::FocusOut:
-        if(focusEvent->reason() != Qt::PopupFocusReason) {
-            emit compositeFocusChanged(false);
-        }
-        break;
-    default:
-        break;
-    }
-    return false;
-}
-
-void CompositeWidgetFocusWatcher::registerWidgetAndChildren(QWidget *widget)
-{
-    Q_ASSERT(widget != nullptr);
-
-    if (widget->focusPolicy() != Qt::NoFocus) {
-        widget->installEventFilter(this);
-    }
-    for (auto *child: widget->children()) {
-        auto *childWidget = qobject_cast<QWidget *>(child);
-        if (childWidget != nullptr) {
-            registerWidgetAndChildren(childWidget);
-        }
-    }
-}

src/widgets/TerminalDisplay.h

@@ -930,28 +930,6 @@ private:
     int _timerId;
 };
 
-// Watches compositeWidget and all its focusable children,
-// and emits focusChanged() signal when either compositeWidget's
-// or a child's focus changed.
-// Limitation: children added after the object was created
-// will not be registered.
-class CompositeWidgetFocusWatcher : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit CompositeWidgetFocusWatcher(QWidget *compositeWidget, QObject *parent);
-    bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
-
-Q_SIGNALS:
-    void compositeFocusChanged(bool focused);
-
-private:
-    void registerWidgetAndChildren(QWidget *widget);
-
-    QWidget *_compositeWidget;
-};
-
 }
 
 #endif // TERMINALDISPLAY_H