From 8acf76c5d1939a141d95c5b6028cd3b71517dd41 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Sat, 11 Jul 2026 08:05:13 -0400 Subject: [PATCH] refactor: simplify Config::readSectionOptions to look for only keystroke mousepress and end --- src/lib/server/Config.cpp | 7 +++---- src/lib/server/Config.h | 16 ---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/lib/server/Config.cpp b/src/lib/server/Config.cpp index cdf3b4304..6149c60a3 100644 --- a/src/lib/server/Config.cpp +++ b/src/lib/server/Config.cpp @@ -484,9 +484,11 @@ void Config::readSectionOptions(ConfigReadContext &s) std::string line; while (s.readLine(line)) { - // check for end of section if (line == "end") { return; + } else if (const auto l = QString::fromStdString(line).simplified(); + !l.startsWith(QStringLiteral("keystroke")) && !l.startsWith(QStringLiteral("mousepress"))) { + continue; } // parse argument: `nameAndArgs = [values][;[values]]' @@ -502,9 +504,6 @@ void Config::readSectionOptions(ConfigReadContext &s) ++i; s.parseNameWithArgs("value", line, ",;\n", i, value, valueArgs); - if (m_oldNames.contains(name)) - continue; - // make filter rule InputFilter::Rule rule(parseCondition(s, name, nameArgs)); diff --git a/src/lib/server/Config.h b/src/lib/server/Config.h index f2873f4e4..420a8ccd3 100644 --- a/src/lib/server/Config.h +++ b/src/lib/server/Config.h @@ -419,22 +419,6 @@ private: InputFilter m_inputFilter; bool m_hasLockToScreenAction = false; IEventQueue *m_events; - inline static const QStringList m_oldNames = { - QStringLiteral("clipboardSharing"), - QStringLiteral("clipboardSharingSize"), - QStringLiteral("switchCornerSize"), - QStringLiteral("switchCorners"), - QStringLiteral("switchNeeds"), - QStringLiteral("protocol"), - QStringLiteral("heartbeat"), - QStringLiteral("switchDelay"), - QStringLiteral("switchDoubleTap"), - QStringLiteral("relativeMouseMoves"), - QStringLiteral("win32KeepForeground"), - QStringLiteral("disableLockToScreen"), - QStringLiteral("defaultLockToScreenState"), - QStringLiteral("address") - }; }; //! Configuration read context