From f14184ddc0220d4f4d247242e90d35fd8af1b461 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 11 Apr 2020 22:01:23 +0200 Subject: [PATCH] Style and minor UI tweaks --- src/blackcore/context/context.h | 2 +- src/blackcore/context/contextnetwork.h | 2 +- src/blackcore/context/contextsimulatorimpl.cpp | 2 +- src/blackgui/components/logindialog.ui | 4 ++-- src/blackmisc/simulation/simulatorplugininfo.cpp | 9 +++++---- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/blackcore/context/context.h b/src/blackcore/context/context.h index ba0c60afb..1ec64861f 100644 --- a/src/blackcore/context/context.h +++ b/src/blackcore/context/context.h @@ -42,7 +42,7 @@ namespace BlackCore public: //! Destructor - virtual ~IContext() {} + virtual ~IContext() override {} //! Log categories static const BlackMisc::CLogCategoryList &getLogCategories(); diff --git a/src/blackcore/context/contextnetwork.h b/src/blackcore/context/contextnetwork.h index 495ac3459..4b0dfcc4c 100644 --- a/src/blackcore/context/contextnetwork.h +++ b/src/blackcore/context/contextnetwork.h @@ -64,7 +64,7 @@ namespace BlackMisc class CAircraftParts; class CCallsign; } - namespace Network { class CTextMessage; } + namespace Network { class CTextMessage; } namespace Simulation { class CAircraftModel; } } namespace BlackCore diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 836f2afc4..bff717cd3 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -813,7 +813,7 @@ namespace BlackCore void CContextSimulator::xCtxNetworkConnectionStatusChanged(const CConnectionStatus &from, const CConnectionStatus &to) { - Q_UNUSED(from); + Q_UNUSED(from) BLACK_VERIFY_X(this->getIContextNetwork(), Q_FUNC_INFO, "Missing network context"); if (to.isConnected() && this->getIContextNetwork()) { diff --git a/src/blackgui/components/logindialog.ui b/src/blackgui/components/logindialog.ui index 3d0bfecc1..d1c199acd 100644 --- a/src/blackgui/components/logindialog.ui +++ b/src/blackgui/components/logindialog.ui @@ -6,8 +6,8 @@ 0 0 - 350 - 550 + 450 + 600 diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp index 50e6cd395..ed378d385 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.cpp +++ b/src/blackmisc/simulation/simulatorplugininfo.cpp @@ -11,6 +11,7 @@ #include #include +using namespace BlackConfig; using namespace BlackMisc; namespace BlackMisc @@ -31,7 +32,7 @@ namespace BlackMisc // json data is already validated by CPluginManagerSimulator CJsonScope scope("MetaData"); - Q_UNUSED(scope); + Q_UNUSED(scope) CValueObject::convertFromJson(json["MetaData"].toObject()); m_valid = true; } @@ -62,7 +63,7 @@ namespace BlackMisc QString CSimulatorPluginInfo::convertToQString(bool i18n) const { - Q_UNUSED(i18n); + Q_UNUSED(i18n) return QStringLiteral("%1 (%2)").arg(m_name, m_identifier); } @@ -118,7 +119,7 @@ namespace BlackMisc QStringList CSimulatorPluginInfo::guessDefaultPlugins() { - if (BlackConfig::CBuildConfig::isRunningOnUnixPlatform()) + if (CBuildConfig::isRunningOnUnixPlatform()) { // On UNIX we likely run XP return QStringList { xplanePluginIdentifier(), fgPluginIdentifier() }; @@ -129,7 +130,7 @@ namespace BlackMisc fsxPluginIdentifier(), p3dPluginIdentifier(), xplanePluginIdentifier(), - fgPluginIdentifier() + fgPluginIdentifier() }; } } // ns