From 29c57dde3e37811993c52bda5737f20788375530 Mon Sep 17 00:00:00 2001 From: tzobler Date: Sat, 31 Jan 2026 11:31:35 +0100 Subject: [PATCH] refactor: Minor cleanup --- src/core/airspacemonitor.cpp | 2 +- src/gui/components/logincomponent.cpp | 3 +-- src/gui/editors/ownmodelsetform.ui | 6 +++--- src/gui/models/aircraftmodellistmodel.cpp | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/core/airspacemonitor.cpp b/src/core/airspacemonitor.cpp index c645cade3..a4ccacfe0 100644 --- a/src/core/airspacemonitor.cpp +++ b/src/core/airspacemonitor.cpp @@ -816,7 +816,7 @@ namespace swift::core usedModelString.clear(); CCallsign::addLogDetailsToList( pReverseLookupMessages, callsign, - QStringLiteral("FsInn modelstring '%1' ignored because of setuo").arg(modelString)); + QStringLiteral("FsInn modelstring '%1' ignored because of setup").arg(modelString)); } else if (!CAircraftMatcher::isKnownModelString(modelString, callsign, pReverseLookupMessages)) { diff --git a/src/gui/components/logincomponent.cpp b/src/gui/components/logincomponent.cpp index e9eb99d7f..6484f36be 100644 --- a/src/gui/components/logincomponent.cpp +++ b/src/gui/components/logincomponent.cpp @@ -299,7 +299,6 @@ namespace swift::gui::components { if (!m_updatePilotOnServerChanges) { return; } const bool vatsim = this->isVatsimNetworkTabSelected(); - // const CUser user = vatsim ? this->getCurrentVatsimServer().getUser() : server.getUser(); const CUser user = server.getServerType() != CServer::FSDServer ? this->getCurrentVatsimServer().getUser() : server.getUser(); if ((vatsim && server.getServerType() != CServer::FSDServer) || @@ -403,7 +402,7 @@ namespace swift::gui::components { int v = ui->pb_LogoffTimeout->value(); v -= 1; - v = std::max(v, 0); + if (v < 0) { v = 0; } ui->pb_LogoffTimeout->setValue(v); if (v <= 0) { diff --git a/src/gui/editors/ownmodelsetform.ui b/src/gui/editors/ownmodelsetform.ui index c075c493d..99ecf31ca 100644 --- a/src/gui/editors/ownmodelsetform.ui +++ b/src/gui/editors/ownmodelsetform.ui @@ -164,6 +164,9 @@ all shown below + + true + bg_Distributors @@ -194,9 +197,6 @@ all distributors - - true - bg_Distributors diff --git a/src/gui/models/aircraftmodellistmodel.cpp b/src/gui/models/aircraftmodellistmodel.cpp index 1031b9ff5..c312407ac 100644 --- a/src/gui/models/aircraftmodellistmodel.cpp +++ b/src/gui/models/aircraftmodellistmodel.cpp @@ -81,7 +81,7 @@ namespace swift::gui::models case OwnAircraftModelMappingTool: case StashModel: - m_columns.addColumn(CColumn::standardString("model", CAircraftModel::IndexModelString)); + m_columns.addColumn(CColumn::standardString("model", { CAircraftModel::IndexModelString })); m_columns.addColumn( CColumn("DB", "DB metadata", CAircraftModel::IndexDatabaseIcon, new CPixmapFormatter())); if (mode == StashModel)