From 70a063a34c53bc6b9e9c65789f1ed36d85df8ff0 Mon Sep 17 00:00:00 2001 From: Vlad Zahorodnii Date: Wed, 15 Feb 2023 21:46:21 +0200 Subject: [PATCH] scripting: Rename ScreenEdgeItem to ScreenEdgeHandler ScreenEdgeItem is not an item, so rename it to something else. "Handler" is inspired by QtQuick, e.g. TapHandler. --- .../scripting/scripts/screenedgetouch.qml | 6 +++--- src/CMakeLists.txt | 2 +- ...reenedgeitem.cpp => screenedgehandler.cpp} | 20 +++++++++---------- .../{screenedgeitem.h => screenedgehandler.h} | 14 ++++++------- src/scripting/scripting.cpp | 4 ++-- 5 files changed, 23 insertions(+), 23 deletions(-) rename src/scripting/{screenedgeitem.cpp => screenedgehandler.cpp} (79%) rename src/scripting/{screenedgeitem.h => screenedgehandler.h} (87%) diff --git a/autotests/integration/scripting/scripts/screenedgetouch.qml b/autotests/integration/scripting/scripts/screenedgetouch.qml index 9a92c78c12..f82ee2da77 100644 --- a/autotests/integration/scripting/scripts/screenedgetouch.qml +++ b/autotests/integration/scripting/scripts/screenedgetouch.qml @@ -1,9 +1,9 @@ import QtQuick 2.0; import org.kde.kwin 3.0; -ScreenEdgeItem { - edge: ScreenEdgeItem.LeftEdge - mode: ScreenEdgeItem.Touch +ScreenEdgeHandler { + edge: ScreenEdgeHandler.LeftEdge + mode: ScreenEdgeHandler.Touch onActivated: { Workspace.slotToggleShowDesktop(); } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 97af6889ec..07409a7592 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -139,7 +139,7 @@ target_sources(kwin PRIVATE screenedge.cpp scripting/dbuscall.cpp scripting/desktopbackgrounditem.cpp - scripting/screenedgeitem.cpp + scripting/screenedgehandler.cpp scripting/scriptedeffect.cpp scripting/scripting.cpp scripting/scripting_logging.cpp diff --git a/src/scripting/screenedgeitem.cpp b/src/scripting/screenedgehandler.cpp similarity index 79% rename from src/scripting/screenedgeitem.cpp rename to src/scripting/screenedgehandler.cpp index 5dff03007b..625b870d42 100644 --- a/src/scripting/screenedgeitem.cpp +++ b/src/scripting/screenedgehandler.cpp @@ -6,7 +6,7 @@ SPDX-License-Identifier: GPL-2.0-or-later */ -#include "screenedgeitem.h" +#include "screenedgehandler.h" #include @@ -18,20 +18,20 @@ namespace KWin { -ScreenEdgeItem::ScreenEdgeItem(QObject *parent) +ScreenEdgeHandler::ScreenEdgeHandler(QObject *parent) : QObject(parent) , m_enabled(true) , m_edge(NoEdge) , m_action(new QAction(this)) { - connect(m_action, &QAction::triggered, this, &ScreenEdgeItem::activated); + connect(m_action, &QAction::triggered, this, &ScreenEdgeHandler::activated); } -ScreenEdgeItem::~ScreenEdgeItem() +ScreenEdgeHandler::~ScreenEdgeHandler() { } -void ScreenEdgeItem::setEnabled(bool enabled) +void ScreenEdgeHandler::setEnabled(bool enabled) { if (m_enabled == enabled) { return; @@ -42,7 +42,7 @@ void ScreenEdgeItem::setEnabled(bool enabled) Q_EMIT enabledChanged(); } -void ScreenEdgeItem::setEdge(Edge edge) +void ScreenEdgeHandler::setEdge(Edge edge) { if (m_edge == edge) { return; @@ -53,7 +53,7 @@ void ScreenEdgeItem::setEdge(Edge edge) Q_EMIT edgeChanged(); } -void ScreenEdgeItem::enableEdge() +void ScreenEdgeHandler::enableEdge() { if (!m_enabled || m_edge == NoEdge) { return; @@ -70,7 +70,7 @@ void ScreenEdgeItem::enableEdge() } } -void ScreenEdgeItem::disableEdge() +void ScreenEdgeHandler::disableEdge() { if (!m_enabled || m_edge == NoEdge) { return; @@ -87,7 +87,7 @@ void ScreenEdgeItem::disableEdge() } } -bool ScreenEdgeItem::borderActivated(ElectricBorder edge) +bool ScreenEdgeHandler::borderActivated(ElectricBorder edge) { if (edge != static_cast(m_edge) || !m_enabled) { return false; @@ -96,7 +96,7 @@ bool ScreenEdgeItem::borderActivated(ElectricBorder edge) return true; } -void ScreenEdgeItem::setMode(Mode mode) +void ScreenEdgeHandler::setMode(Mode mode) { if (m_mode == mode) { return; diff --git a/src/scripting/screenedgeitem.h b/src/scripting/screenedgehandler.h similarity index 87% rename from src/scripting/screenedgeitem.h rename to src/scripting/screenedgehandler.h index cff95d7fff..4327aec16e 100644 --- a/src/scripting/screenedgeitem.h +++ b/src/scripting/screenedgehandler.h @@ -25,13 +25,13 @@ namespace KWin * * Example usage: * @code - * ScreenEdgeItem { - * edge: ScreenEdgeItem.LeftEdge + * ScreenEdgeHandler { + * edge: ScreenEdgeHandler.LeftEdge * onActivated: doSomething() * } * @endcode */ -class ScreenEdgeItem : public QObject +class ScreenEdgeHandler : public QObject { Q_OBJECT /** @@ -68,8 +68,8 @@ public: Touch }; Q_ENUM(Mode) - explicit ScreenEdgeItem(QObject *parent = nullptr); - ~ScreenEdgeItem() override; + explicit ScreenEdgeHandler(QObject *parent = nullptr); + ~ScreenEdgeHandler() override; bool isEnabled() const; Edge edge() const; Mode mode() const @@ -101,12 +101,12 @@ private: QAction *m_action; }; -inline bool ScreenEdgeItem::isEnabled() const +inline bool ScreenEdgeHandler::isEnabled() const { return m_enabled; } -inline ScreenEdgeItem::Edge ScreenEdgeItem::edge() const +inline ScreenEdgeHandler::Edge ScreenEdgeHandler::edge() const { return m_edge; } diff --git a/src/scripting/scripting.cpp b/src/scripting/scripting.cpp index 8f694d21cc..9a41df8717 100644 --- a/src/scripting/scripting.cpp +++ b/src/scripting/scripting.cpp @@ -14,7 +14,7 @@ #include "dbuscall.h" #include "desktopbackgrounditem.h" #include "kwinquickeffect.h" -#include "screenedgeitem.h" +#include "screenedgehandler.h" #include "scripting_logging.h" #include "scriptingutils.h" #include "virtualdesktopmodel.h" @@ -676,7 +676,7 @@ void KWin::Scripting::init() qmlRegisterType("org.kde.kwin", 3, 0, "DesktopBackground"); qmlRegisterType("org.kde.kwin", 3, 0, "WindowThumbnail"); qmlRegisterType("org.kde.kwin", 3, 0, "DBusCall"); - qmlRegisterType("org.kde.kwin", 3, 0, "ScreenEdgeItem"); + qmlRegisterType("org.kde.kwin", 3, 0, "ScreenEdgeHandler"); qmlRegisterType("org.kde.kwin", 3, 0, "WindowModel"); qmlRegisterType("org.kde.kwin", 3, 0, "WindowFilterModel"); qmlRegisterType("org.kde.kwin", 3, 0, "VirtualDesktopModel");