From a004cd8eba5b3868d21fb7069e9e12fbb43a2172 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sun, 10 Jan 2021 15:28:06 +0200 Subject: [PATCH] gui/test: Put createAction() to anonymous namespace --- src/gui/test/HotkeyTests.cpp | 61 +++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/src/gui/test/HotkeyTests.cpp b/src/gui/test/HotkeyTests.cpp index e3d31ac5..0df017f5 100644 --- a/src/gui/test/HotkeyTests.cpp +++ b/src/gui/test/HotkeyTests.cpp @@ -96,39 +96,42 @@ struct TestHotKey std::vector actions; }; -Action createAction(const TestAction& test_action) -{ - Action action; - action.setType(test_action.type); +namespace { - switch (test_action.type) { - case Action::keyDown: - case Action::keyUp: - case Action::keystroke: { - KeySequence sequence; - for (auto key : test_action.keys) { - sequence.appendKey(key.key, key.modifier); + Action createAction(const TestAction& test_action) + { + Action action; + action.setType(test_action.type); + + switch (test_action.type) { + case Action::keyDown: + case Action::keyUp: + case Action::keystroke: { + KeySequence sequence; + for (auto key : test_action.keys) { + sequence.appendKey(key.key, key.modifier); + } + action.setKeySequence(sequence); + for (const auto& type_screen_name : test_action.type_screen_names) { + action.appendTypeScreenName(QString::fromStdString(type_screen_name)); + } + break; } - action.setKeySequence(sequence); - for (const auto& type_screen_name : test_action.type_screen_names) { - action.appendTypeScreenName(QString::fromStdString(type_screen_name)); - } - break; + case Action::switchToScreen: + action.setSwitchScreenName(QString::fromStdString(test_action.screen_name)); + break; + case Action::toggleScreen: + break; + case Action::switchInDirection: + action.setSwitchDirection(test_action.switch_direction); + break; + case Action::lockCursorToScreen: + action.setLockCursorMode(test_action.lock_cursor_mode); + break; } - case Action::switchToScreen: - action.setSwitchScreenName(QString::fromStdString(test_action.screen_name)); - break; - case Action::toggleScreen: - break; - case Action::switchInDirection: - action.setSwitchDirection(test_action.switch_direction); - break; - case Action::lockCursorToScreen: - action.setLockCursorMode(test_action.lock_cursor_mode); - break; + return action; } - return action; -} +} // namespace void doHotkeyLoadSaveTest(const TestHotKey& test_hotkey, QSettings::Format format) {