diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h
index 98e06330f..eb6cf36ef 100644
--- a/src/blackcore/context/contextsimulator.h
+++ b/src/blackcore/context/contextsimulator.h
@@ -166,6 +166,7 @@ namespace BlackCore
virtual BlackMisc::Simulation::CSimulatorInfo simulatorsWithInitializedModelSet() const = 0;
//! Verify prerequisites for simulation like an existing model set
+ //! \pre system needs to be initialized to work correctly
virtual BlackMisc::CStatusMessageList verifyPrerequisites() const = 0;
//! Number of installed models in simulator eco system
diff --git a/src/blackcore/context/contextsimulatorproxy.cpp b/src/blackcore/context/contextsimulatorproxy.cpp
index 169af674c..91c3ba99e 100644
--- a/src/blackcore/context/contextsimulatorproxy.cpp
+++ b/src/blackcore/context/contextsimulatorproxy.cpp
@@ -83,7 +83,6 @@ namespace BlackCore
Q_ASSERT(s);
s = connection.connect(serviceName, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName(),
"requestUiConsoleMessage", this, SIGNAL(requestUiConsoleMessage(QString, bool)));
-
Q_ASSERT(s);
Q_UNUSED(s);
this->relayBaseClassSignals(serviceName, connection, IContextSimulator::ObjectPath(), IContextSimulator::InterfaceName());
diff --git a/src/blackcore/data/globalsetup.cpp b/src/blackcore/data/globalsetup.cpp
index 50e7755a2..306017215 100644
--- a/src/blackcore/data/globalsetup.cpp
+++ b/src/blackcore/data/globalsetup.cpp
@@ -270,73 +270,73 @@ namespace BlackCore
QString CGlobalSetup::convertToQString(const QString &separator, bool i18n) const
{
QString s =
- "timestamp: "
+ QStringLiteral("timestamp: ")
% this->getFormattedUtcTimestampYmdhms()
% separator
- % "Global setup loaded: "
+ % QStringLiteral("Global setup loaded: ")
% boolToYesNo(this->wasLoaded())
% separator
- % "For development: "
+ % QStringLiteral("For development: ")
% boolToYesNo(isDevelopment())
% separator
- % "Mapping min.version: "
+ % QStringLiteral("Mapping min.version: ")
% this->getMappingMinimumVersionString()
% separator
- % "Distribution URLs: "
+ % QStringLiteral("Distribution URLs: ")
% getSwiftUpdateInfoFileUrls().toQString(i18n)
% separator
- % "Bootstrap URLs: "
+ % QStringLiteral("Bootstrap URLs: ")
% getSwiftBootstrapFileUrls().toQString(i18n)
% separator
- % "News URLs: "
+ % QStringLiteral("News URLs: ")
% getSwiftLatestNewsUrls().toQString(i18n)
% separator
- % "Help URLs: "
+ % QStringLiteral("Help URLs: ")
% m_onlineHelpUrls.toQString(i18n)
% separator
- % "swift map URLs: "
+ % QStringLiteral("swift map URLs: ")
% getSwiftMapUrls().toQString(i18n)
% separator;
s +=
- "DB root directory: "
+ QStringLiteral("DB root directory: ")
% getDbRootDirectoryUrl().toQString(i18n)
% separator
- % "ICAO DB reader: "
+ % QStringLiteral("ICAO DB reader: ")
% getDbIcaoReaderUrl().toQString(i18n)
% separator
- % "Model DB reader: "
+ % QStringLiteral("Model DB reader: ")
% getDbModelReaderUrl().toQString(i18n)
% separator
- % "Airport DB reader: "
+ % QStringLiteral("Airport DB reader: ")
% getDbAirportReaderUrl().toQString(i18n)
% separator
- % "DB home page: "
+ % QStringLiteral("DB home page: ")
% getDbHomePageUrl().toQString(i18n)
% separator
- % "DB login service: "
+ % QStringLiteral("DB login service: ")
% getDbLoginServiceUrl().toQString(i18n)
% separator
- % "DB client ping service: "
+ % QStringLiteral("DB client ping service: ")
% getDbClientPingServiceUrl().toQString(i18n);
s +=
- "VATSIM bookings: "
+ QStringLiteral("VATSIM bookings: ")
% getVatsimBookingsUrl().toQString(i18n)
% separator
- % "VATSIM METARs: "
+ % QStringLiteral("VATSIM METARs: ")
% getVatsimMetarsUrls().toQString(i18n)
% separator
- % "VATSIM data file: "
+ % QStringLiteral("VATSIM data file: ")
% getVatsimDataFileUrls().toQString(i18n)
% separator
- % "FSD test servers: "
+ % QStringLiteral("FSD test servers: ")
% getFsdTestServers().toQString(i18n)
% separator
- % "Crash report server: "
+ % QStringLiteral("Crash report server: ")
% getCrashReportServerUrl().toQString(i18n);
return s;
diff --git a/src/blackcore/simulator.cpp b/src/blackcore/simulator.cpp
index e01961154..8b0bb00f6 100644
--- a/src/blackcore/simulator.cpp
+++ b/src/blackcore/simulator.cpp
@@ -1140,8 +1140,4 @@ namespace BlackCore
this->stopImpl();
m_isRunning = false;
}
-
- ISimulatorFactory::~ISimulatorFactory()
- { }
-
} // namespace
diff --git a/src/blackcore/simulator.h b/src/blackcore/simulator.h
index 160a919bf..e96c31a34 100644
--- a/src/blackcore/simulator.h
+++ b/src/blackcore/simulator.h
@@ -604,7 +604,7 @@ namespace BlackCore
{
public:
//! ISimulatorVirtual destructor
- virtual ~ISimulatorFactory();
+ virtual ~ISimulatorFactory() {}
//! Create a new instance of a driver
//! \param info metadata about simulator
diff --git a/src/blackcore/threadedreader.cpp b/src/blackcore/threadedreader.cpp
index ed8aa5c55..f3e1cc16d 100644
--- a/src/blackcore/threadedreader.cpp
+++ b/src/blackcore/threadedreader.cpp
@@ -177,7 +177,7 @@ namespace BlackCore
const CUrlLogList outdatedPendingUrls = m_urlReadLog.findOutdatedPending(OutdatedPendingCallMs);
if (!outdatedPendingUrls.isEmpty())
{
- CLogMessage(this).warning("Detected outdated pending calls: '%1'") << outdatedPendingUrls.toQString(true);
+ CLogMessage(this).warning("Detected outdated reader pending calls: '%1'") << outdatedPendingUrls.toQString(true);
m_urlReadLog.removeOlderThanNowMinusOffset(OutdatedPendingCallMs); // clean up
}
diff --git a/src/blackmisc/genericdbusinterface.h b/src/blackmisc/genericdbusinterface.h
index d7ebe1297..4aac85615 100644
--- a/src/blackmisc/genericdbusinterface.h
+++ b/src/blackmisc/genericdbusinterface.h
@@ -37,7 +37,7 @@ namespace BlackMisc
{
public:
//! Constructor
- CGenericDBusInterface(const QString &serviceName, const QString &path, const QString &interfaceName, const QDBusConnection &connection, QObject *parent = 0) :
+ CGenericDBusInterface(const QString &serviceName, const QString &path, const QString &interfaceName, const QDBusConnection &connection, QObject *parent = nullptr) :
QDBusAbstractInterface(serviceName, path, interfaceName.toUtf8().constData(), connection, parent)
{ }
diff --git a/src/blackmisc/network/voicecapabilites.cpp b/src/blackmisc/network/voicecapabilites.cpp
index 3913aa408..267062365 100644
--- a/src/blackmisc/network/voicecapabilites.cpp
+++ b/src/blackmisc/network/voicecapabilites.cpp
@@ -35,7 +35,7 @@ namespace BlackMisc
static const QString r("voice listening only");
static const QString u("unknown");
- switch (this->m_voiceCapabilities)
+ switch (m_voiceCapabilities)
{
case Voice: return v;
case TextOnly: return t;
@@ -64,7 +64,7 @@ namespace BlackMisc
CIcon CVoiceCapabilities::toIcon() const
{
- switch (this->m_voiceCapabilities)
+ switch (m_voiceCapabilities)
{
case Voice: return CIcon::iconByIndex(CIcons::NetworkCapabilityVoiceBackground);
case TextOnly: return CIcon::iconByIndex(CIcons::NetworkCapabilityTextOnly);
diff --git a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
index 41a6879eb..e1beedab5 100644
--- a/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
+++ b/src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.ui
@@ -6,10 +6,16 @@
0
0
- 273
- 191
+ 275
+ 175
+
+
+ 250
+ 150
+
+
X-Plane plugin settings
diff --git a/src/swiftguistandard/swiftguistdinit.cpp b/src/swiftguistandard/swiftguistdinit.cpp
index 49eca9368..f8021fc88 100644
--- a/src/swiftguistandard/swiftguistdinit.cpp
+++ b/src/swiftguistandard/swiftguistdinit.cpp
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include
class QHBoxLayout;
@@ -177,7 +178,12 @@ void SwiftGuiStd::init()
emit sGui->startUpCompleted(true);
m_init = true;
- QTimer::singleShot(2500, this, &SwiftGuiStd::verifyPrerequisites);
+ QPointer myself(this);
+ QTimer::singleShot(5000, this, [ = ]
+ {
+ if (!myself) { return; }
+ this->verifyPrerequisites();
+ });
}
void SwiftGuiStd::initStyleSheet()