hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-07 15:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

changed C++ std to C++23, use std::string::contains

Browse source
This commit is contained in:
vaxerski 2022-07-06 16:50:11 +02:00
parent 0d7a8cca79
commit f9756d10d4
9 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -37,7 +37,7 @@ execute_process(
include_directories(. PRIVATE "subprojects/wlroots/include/") include_directories(. PRIVATE "subprojects/wlroots/include/")
include_directories(. PRIVATE "subprojects/wlroots/build/include/") include_directories(. PRIVATE "subprojects/wlroots/build/include/")
add_compile_options(-std=c++20 -DWLR_USE_UNSTABLE ) add_compile_options(-std=c++2b -DWLR_USE_UNSTABLE )
add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing) add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)

6
src/config/ConfigManager.cpp
View file

@ -356,7 +356,7 @@ void CConfigManager::handleMonitor(const std::string& command, const std::string
newrule.resolution.x = stoi(curitem.substr(0, curitem.find_first_of('x'))); newrule.resolution.x = stoi(curitem.substr(0, curitem.find_first_of('x')));
newrule.resolution.y = stoi(curitem.substr(curitem.find_first_of('x') + 1, curitem.find_first_of('@'))); newrule.resolution.y = stoi(curitem.substr(curitem.find_first_of('x') + 1, curitem.find_first_of('@')));
if (curitem.find_first_of('@') != std::string::npos) if (curitem.contains("@"))
newrule.refreshRate = stof(curitem.substr(curitem.find_first_of('@') + 1)); newrule.refreshRate = stof(curitem.substr(curitem.find_first_of('@') + 1));
nextItem(); nextItem();
@ -722,7 +722,7 @@ void CConfigManager::parseLine(std::string& line) {
line = line.substr(1); line = line.substr(1);
} }
if (line.find(" {") != std::string::npos) { if (line.contains(" {")) {
auto cat = line.substr(0, line.find(" {")); auto cat = line.substr(0, line.find(" {"));
transform(cat.begin(), cat.end(), cat.begin(), ::tolower); transform(cat.begin(), cat.end(), cat.begin(), ::tolower);
if (currentCategory.length() != 0) { if (currentCategory.length() != 0) {
@ -736,7 +736,7 @@ void CConfigManager::parseLine(std::string& line) {
return; return;
} }
if (line.find("}") != std::string::npos && currentCategory != "") { if (line.contains("}") && currentCategory != "") {
currentCategory = ""; currentCategory = "";
return; return;
} }

2
src/debug/HyprCtl.cpp
View file

@ -158,7 +158,7 @@ std::string dispatchKeyword(std::string in) {
if (COMMAND == "monitor") if (COMMAND == "monitor")
g_pConfigManager->m_bWantsMonitorReload = true; // for monitor keywords g_pConfigManager->m_bWantsMonitorReload = true; // for monitor keywords
if (COMMAND.find("input") != std::string::npos) if (COMMAND.contains("input"))
g_pInputManager->setKeyboardLayout(); // update kb layout g_pInputManager->setKeyboardLayout(); // update kb layout
Debug::log(LOG, "Hyprctl: keyword %s : %s", COMMAND.c_str(), VALUE.c_str()); Debug::log(LOG, "Hyprctl: keyword %s : %s", COMMAND.c_str(), VALUE.c_str());

14
src/events/Windows.cpp
View file

@ -152,7 +152,7 @@ void Events::listener_mapWindow(void* owner, void* data) {
try { try {
std::string alphaPart = r.szRule.substr(r.szRule.find_first_of(' ') + 1); std::string alphaPart = r.szRule.substr(r.szRule.find_first_of(' ') + 1);
if (alphaPart.find_first_of(' ') != std::string::npos) { if (alphaPart.contains(' ')) {
// we have a comma, 2 values // we have a comma, 2 values
PWINDOW->m_sSpecialRenderData.alpha = std::stof(alphaPart.substr(0, alphaPart.find_first_of(' '))); PWINDOW->m_sSpecialRenderData.alpha = std::stof(alphaPart.substr(0, alphaPart.find_first_of(' ')));
PWINDOW->m_sSpecialRenderData.alphaInactive = std::stof(alphaPart.substr(alphaPart.find_first_of(' ') + 1)); PWINDOW->m_sSpecialRenderData.alphaInactive = std::stof(alphaPart.substr(alphaPart.find_first_of(' ') + 1));
@ -170,9 +170,9 @@ void Events::listener_mapWindow(void* owner, void* data) {
if (requestedWorkspace != "") { if (requestedWorkspace != "") {
// process requested workspace // process requested workspace
if (requestedWorkspace.find_first_of(' ') != std::string::npos) { if (requestedWorkspace.contains(' ')) {
// check for silent // check for silent
if (requestedWorkspace.find("silent") != std::string::npos) { if (requestedWorkspace.contains("silent")) {
workspaceSilent = true; workspaceSilent = true;
} }
@ -199,8 +199,8 @@ void Events::listener_mapWindow(void* owner, void* data) {
const auto SIZEXSTR = VALUE.substr(0, VALUE.find(" ")); const auto SIZEXSTR = VALUE.substr(0, VALUE.find(" "));
const auto SIZEYSTR = VALUE.substr(VALUE.find(" ") + 1); const auto SIZEYSTR = VALUE.substr(VALUE.find(" ") + 1);
const auto SIZEX = SIZEXSTR.find('%') == std::string::npos ? std::stoi(SIZEXSTR) : std::stoi(SIZEXSTR.substr(0, SIZEXSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.x; const auto SIZEX = !SIZEXSTR.contains('%') ? std::stoi(SIZEXSTR) : std::stoi(SIZEXSTR.substr(0, SIZEXSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.x;
const auto SIZEY = SIZEYSTR.find('%') == std::string::npos ? std::stoi(SIZEYSTR) : std::stoi(SIZEYSTR.substr(0, SIZEYSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.y; const auto SIZEY = !SIZEYSTR.contains('%') ? std::stoi(SIZEYSTR) : std::stoi(SIZEYSTR.substr(0, SIZEYSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.y;
Debug::log(LOG, "Rule size, applying to window %x", PWINDOW); Debug::log(LOG, "Rule size, applying to window %x", PWINDOW);
@ -215,8 +215,8 @@ void Events::listener_mapWindow(void* owner, void* data) {
const auto POSXSTR = VALUE.substr(0, VALUE.find(" ")); const auto POSXSTR = VALUE.substr(0, VALUE.find(" "));
const auto POSYSTR = VALUE.substr(VALUE.find(" ") + 1); const auto POSYSTR = VALUE.substr(VALUE.find(" ") + 1);
const auto POSX = POSXSTR.find('%') == std::string::npos ? std::stoi(POSXSTR) : std::stoi(POSXSTR.substr(0, POSXSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.x; const auto POSX = !POSXSTR.contains('%') ? std::stoi(POSXSTR) : std::stoi(POSXSTR.substr(0, POSXSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.x;
const auto POSY = POSYSTR.find('%') == std::string::npos ? std::stoi(POSYSTR) : std::stoi(POSYSTR.substr(0, POSYSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.y; const auto POSY = !POSYSTR.contains('%') ? std::stoi(POSYSTR) : std::stoi(POSYSTR.substr(0, POSYSTR.length() - 1)) * 0.01f * PMONITOR->vecSize.y;
Debug::log(LOG, "Rule move, applying to window %x", PWINDOW); Debug::log(LOG, "Rule move, applying to window %x", PWINDOW);

6
src/helpers/MiscFunctions.cpp
View file

@ -137,7 +137,7 @@ float getPlusMinusKeywordResult(std::string source, float relative) {
if (source.find_first_of("+") == 0) { if (source.find_first_of("+") == 0) {
try { try {
if (source.find('.') != std::string::npos) if (source.contains("."))
result = relative + std::stof(source.substr(1)); result = relative + std::stof(source.substr(1));
else else
result = relative + std::stoi(source.substr(1)); result = relative + std::stoi(source.substr(1));
@ -147,7 +147,7 @@ float getPlusMinusKeywordResult(std::string source, float relative) {
} }
} else if (source.find_first_of("-") == 0) { } else if (source.find_first_of("-") == 0) {
try { try {
if (source.find('.') != std::string::npos) if (source.contains("."))
result = relative - std::stof(source.substr(1)); result = relative - std::stof(source.substr(1));
else else
result = relative - std::stoi(source.substr(1)); result = relative - std::stoi(source.substr(1));
@ -157,7 +157,7 @@ float getPlusMinusKeywordResult(std::string source, float relative) {
} }
} else { } else {
try { try {
if (source.find('.') != std::string::npos) if (source.contains("."))
result = stof(source); result = stof(source);
else else
result = stoi(source); result = stoi(source);

2
src/managers/AnimationManager.cpp
View file

@ -309,7 +309,7 @@ void CAnimationManager::onWindowPostCreateClose(CWindow* pWindow, bool close) {
if (pWindow->m_sAdditionalConfigData.animationStyle != "") { if (pWindow->m_sAdditionalConfigData.animationStyle != "") {
// the window has config'd special anim // the window has config'd special anim
if (pWindow->m_sAdditionalConfigData.animationStyle.find("slide") == 0) { if (pWindow->m_sAdditionalConfigData.animationStyle.find("slide") == 0) {
if (pWindow->m_sAdditionalConfigData.animationStyle.find(' ') != std::string::npos) { if (pWindow->m_sAdditionalConfigData.animationStyle.contains(' ')) {
// has a direction // has a direction
animationSlide(pWindow, pWindow->m_sAdditionalConfigData.animationStyle.substr(pWindow->m_sAdditionalConfigData.animationStyle.find(' ') + 1), close); animationSlide(pWindow, pWindow->m_sAdditionalConfigData.animationStyle.substr(pWindow->m_sAdditionalConfigData.animationStyle.find(' ') + 1), close);
} else { } else {

22
src/managers/KeybindManager.cpp
View file

@ -49,21 +49,21 @@ void CKeybindManager::removeKeybind(uint32_t mod, const std::string& key) {
uint32_t CKeybindManager::stringToModMask(std::string mods) { uint32_t CKeybindManager::stringToModMask(std::string mods) {
uint32_t modMask = 0; uint32_t modMask = 0;
if (mods.find("SHIFT") != std::string::npos) if (mods.contains("SHIFT"))
modMask |= WLR_MODIFIER_SHIFT; modMask |= WLR_MODIFIER_SHIFT;
if (mods.find("CAPS") != std::string::npos) if (mods.contains("CAPS"))
modMask |= WLR_MODIFIER_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; modMask |= WLR_MODIFIER_CTRL;
if (mods.find("ALT") != std::string::npos) if (mods.contains("ALT"))
modMask |= WLR_MODIFIER_ALT; modMask |= WLR_MODIFIER_ALT;
if (mods.find("MOD2") != std::string::npos) if (mods.contains("MOD2"))
modMask |= WLR_MODIFIER_MOD2; modMask |= WLR_MODIFIER_MOD2;
if (mods.find("MOD3") != std::string::npos) if (mods.contains("MOD3"))
modMask |= WLR_MODIFIER_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; modMask |= WLR_MODIFIER_LOGO;
if (mods.find("MOD5") != std::string::npos) if (mods.contains("MOD5"))
modMask |= WLR_MODIFIER_MOD5; modMask |= WLR_MODIFIER_MOD5;
return modMask; return modMask;
@ -823,7 +823,7 @@ void CKeybindManager::moveCurrentWorkspaceToMonitor(std::string args) {
} }
void CKeybindManager::moveWorkspaceToMonitor(std::string args) { void CKeybindManager::moveWorkspaceToMonitor(std::string args) {
if (args.find_first_of(' ') == std::string::npos) if (!args.contains(' '))
return; return;
std::string workspace = args.substr(0, args.find_first_of(' ')); 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) { void CKeybindManager::resizeActive(std::string args) {
if (args.find_first_of(' ') == std::string::npos) if (!args.contains(' '))
return; return;
std::string x = args.substr(0, args.find_first_of(' ')); 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) { void CKeybindManager::moveActive(std::string args) {
if (args.find_first_of(' ') == std::string::npos) if (!args.contains(' '))
return; return;
std::string x = args.substr(0, args.find_first_of(' ')); std::string x = args.substr(0, args.find_first_of(' '));

2
src/managers/KeybindManager.hpp
View file

@ -7,7 +7,7 @@
#include <functional> #include <functional>
struct SKeybind { struct SKeybind {
std::string key = 0; std::string key = "";
uint32_t modmask = 0; uint32_t modmask = 0;
std::string handler = ""; std::string handler = "";
std::string arg = ""; std::string arg = "";

2
src/managers/XWaylandManager.cpp
View file

@ -153,7 +153,7 @@ bool CHyprXWaylandManager::shouldBeFloated(CWindow* pWindow) {
if (pWindow->m_uSurface.xwayland->role) { if (pWindow->m_uSurface.xwayland->role) {
try { try {
std::string winrole = std::string(pWindow->m_uSurface.xwayland->role); std::string winrole = std::string(pWindow->m_uSurface.xwayland->role);
if (winrole.find("pop-up") != std::string::npos || winrole.find("task_dialog") != std::string::npos) { if (winrole.contains("pop-up") || winrole.contains("task_dialog")) {
return true; return true;
} }
} catch (std::exception& e) { } catch (std::exception& e) {