smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: declare vars where they are used in if statements

Browse source
This commit is contained in:
sithlord48 2026-06-18 20:05:10 -04:00 committed by Chris Rizzitello
parent 31018910f8
commit 5eb1d7068e
4 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/lib/base/EventQueue.cpp
View file

@ -69,8 +69,7 @@ int EventQueue::loop()
getEvent(event); getEvent(event);
} }
int exitCode = s_exitSuccess; int exitCode = s_exitSuccess;
auto *exitEvent = dynamic_cast<ExitEventData *>(event.getDataObject()); if (auto *exitEvent = dynamic_cast<ExitEventData *>(event.getDataObject()); exitEvent != nullptr) {
if (exitEvent != nullptr) {
exitCode = exitEvent->exitCode(); exitCode = exitEvent->exitCode();
} }
return exitCode; return exitCode;

5
src/lib/common/Settings.cpp
View file

@ -96,8 +96,9 @@ Settings::Settings(QObject *parent) : QObject(parent)
void Settings::upgradeSettings() void Settings::upgradeSettings()
{ {
const auto logValue = m_settings->value(Settings::Log::Level).toString();
if (!LogLevel::logLevelOptions().contains(logValue, Qt::CaseInsensitive)) if (const auto logValue = m_settings->value(Settings::Log::Level).toString();
!LogLevel::logLevelOptions().contains(logValue, Qt::CaseInsensitive))
m_settings->setValue(Settings::Log::Level, defaultValue(Settings::Log::Level)); m_settings->setValue(Settings::Log::Level, defaultValue(Settings::Log::Level));
for (const auto [oldKey, newKey] : m_upgradedMap.asKeyValueRange()) { for (const auto [oldKey, newKey] : m_upgradedMap.asKeyValueRange()) {

3
src/lib/platform/EiScreen.cpp
View file

@ -69,8 +69,7 @@ EiScreen::EiScreen(bool isPrimary, IEventQueue *events, bool usePortal)
} }
} else { } else {
// Note: socket backend does not support reconnections // Note: socket backend does not support reconnections
auto rc = ei_setup_backend_socket(m_ei, nullptr); if (auto rc = ei_setup_backend_socket(m_ei, nullptr); rc != 0) {
if (rc != 0) {
LOG_ERR("ei init error: %s", strerror(-rc)); LOG_ERR("ei init error: %s", strerror(-rc));
throw std::runtime_error("failed to init ei context"); throw std::runtime_error("failed to init ei context");
} }

12
src/lib/platform/PortalInputCapture.cpp
View file

@ -431,8 +431,7 @@ PortalInputCapture::mapPortalActivationToScreenPosition(guint barrierId, double
std::int32_t screenH; std::int32_t screenH;
m_screen->getShape(screenX, screenY, screenW, screenH); m_screen->getShape(screenX, screenY, screenW, screenH);
Bounds portalBounds; if (Bounds portalBounds; getPortalBounds(portalBounds)) {
if (getPortalBounds(portalBounds)) {
x = scaleCoordinateBetweenRanges(rawX, portalBounds.left, portalBounds.right, screenX, screenX + screenW - 1); x = scaleCoordinateBetweenRanges(rawX, portalBounds.left, portalBounds.right, screenX, screenX + screenW - 1);
y = scaleCoordinateBetweenRanges(rawY, portalBounds.top, portalBounds.bottom, screenY, screenY + screenH - 1); y = scaleCoordinateBetweenRanges(rawY, portalBounds.top, portalBounds.bottom, screenY, screenY + screenH - 1);
} else { } else {
@ -481,8 +480,9 @@ std::pair<double, double> PortalInputCapture::mapPortalReleasePosition(double x,
auto mappedX = scaleCoordinateBetweenRanges(x, screenLeft, screenRight, portalBounds.left, portalBounds.right); auto mappedX = scaleCoordinateBetweenRanges(x, screenLeft, screenRight, portalBounds.left, portalBounds.right);
auto mappedY = scaleCoordinateBetweenRanges(y, screenTop, screenBottom, portalBounds.top, portalBounds.bottom); auto mappedY = scaleCoordinateBetweenRanges(y, screenTop, screenBottom, portalBounds.top, portalBounds.bottom);
BarrierInfo releaseBarrier;
if (getClosestReleaseBarrier(x, y, screenLeft, screenTop, screenRight, screenBottom, portalBounds, releaseBarrier)) { if (BarrierInfo releaseBarrier;
getClosestReleaseBarrier(x, y, screenLeft, screenTop, screenRight, screenBottom, portalBounds, releaseBarrier)) {
const Bounds releaseBounds = { const Bounds releaseBounds = {
releaseBarrier.x, releaseBarrier.y, releaseBarrier.x + static_cast<gint>(releaseBarrier.width) - 1, releaseBarrier.x, releaseBarrier.y, releaseBarrier.x + static_cast<gint>(releaseBarrier.width) - 1,
releaseBarrier.y + static_cast<gint>(releaseBarrier.height) - 1 releaseBarrier.y + static_cast<gint>(releaseBarrier.height) - 1
@ -706,9 +706,9 @@ void PortalInputCapture::handleActivated(
auto warpY = static_cast<int>(y); auto warpY = static_cast<int>(y);
guint barrierId = 0; guint barrierId = 0;
const bool hasBarrierId = g_variant_lookup(options, "barrier_id", "u", &barrierId);
if (hasBarrierId && barrierId > 0) { if (const bool hasBarrierId = g_variant_lookup(options, "barrier_id", "u", &barrierId);
hasBarrierId && barrierId > 0) {
auto [mappedX, mappedY] = mapPortalActivationToScreenPosition(barrierId, x, y); auto [mappedX, mappedY] = mapPortalActivationToScreenPosition(barrierId, x, y);
warpX = mappedX; warpX = mappedX;
warpY = mappedY; warpY = mappedY;