summaryrefslogtreecommitdiff
path: root/src/managers/KeybindManager.cpp
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-07-06 16:50:11 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-07-06 16:50:11 +0200
commitf9756d10d4d1c5ea7737cf3a237b1f966d6b7a01 (patch)
treec88df1366e9af3097edd2025494564ea92e0cb2a /src/managers/KeybindManager.cpp
parent0d7a8cca790e8fa71a83e4dce09fbe5a0af38cbc (diff)
changed C++ std to C++23, use std::string::contains
Diffstat (limited to 'src/managers/KeybindManager.cpp')
-rw-r--r--src/managers/KeybindManager.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index f5ec0e48..d33cd0b6 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -49,21 +49,21 @@ void CKeybindManager::removeKeybind(uint32_t mod, const std::string& key) {
uint32_t CKeybindManager::stringToModMask(std::string mods) {
uint32_t modMask = 0;
- if (mods.find("SHIFT") != std::string::npos)
+ if (mods.contains("SHIFT"))
modMask |= WLR_MODIFIER_SHIFT;
- if (mods.find("CAPS") != std::string::npos)
+ if (mods.contains("CAPS"))
modMask |= WLR_MODIFIER_CAPS;
- if (mods.find("CTRL") != std::string::npos || mods.find("CONTROL") != std::string::npos)
+ if (mods.contains("CTRL") || mods.contains("CONTROL"))
modMask |= WLR_MODIFIER_CTRL;
- if (mods.find("ALT") != std::string::npos)
+ if (mods.contains("ALT"))
modMask |= WLR_MODIFIER_ALT;
- if (mods.find("MOD2") != std::string::npos)
+ if (mods.contains("MOD2"))
modMask |= WLR_MODIFIER_MOD2;
- if (mods.find("MOD3") != std::string::npos)
+ if (mods.contains("MOD3"))
modMask |= WLR_MODIFIER_MOD3;
- if (mods.find("SUPER") != std::string::npos || mods.find("WIN") != std::string::npos || mods.find("LOGO") != std::string::npos || mods.find("MOD4") != std::string::npos)
+ if (mods.contains("SUPER") || mods.contains("WIN") || mods.contains("LOGO") || mods.contains("MOD4"))
modMask |= WLR_MODIFIER_LOGO;
- if (mods.find("MOD5") != std::string::npos)
+ if (mods.contains("MOD5"))
modMask |= WLR_MODIFIER_MOD5;
return modMask;
@@ -823,7 +823,7 @@ void CKeybindManager::moveCurrentWorkspaceToMonitor(std::string args) {
}
void CKeybindManager::moveWorkspaceToMonitor(std::string args) {
- if (args.find_first_of(' ') == std::string::npos)
+ if (!args.contains(' '))
return;
std::string workspace = args.substr(0, args.find_first_of(' '));
@@ -925,7 +925,7 @@ void CKeybindManager::forceRendererReload(std::string args) {
}
void CKeybindManager::resizeActive(std::string args) {
- if (args.find_first_of(' ') == std::string::npos)
+ if (!args.contains(' '))
return;
std::string x = args.substr(0, args.find_first_of(' '));
@@ -974,7 +974,7 @@ void CKeybindManager::resizeActive(std::string args) {
}
void CKeybindManager::moveActive(std::string args) {
- if (args.find_first_of(' ') == std::string::npos)
+ if (!args.contains(' '))
return;
std::string x = args.substr(0, args.find_first_of(' '));