From 8e55baaf85b793635bff6acdd5f56a8e9d6de3b3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 24 Feb 2017 21:13:36 +0100 Subject: [PATCH] Typos, QStringBuilder --- src/blackgui/components/cockpitcomponent.cpp | 1 - .../components/settingssimulatorbasicscomponent.ui | 2 +- src/blackmisc/identifier.cpp | 12 ++++++------ src/blackmisc/simulation/data/modelcaches.h | 2 +- src/blackmisc/simulation/fscommon/fscommonutil.cpp | 1 + .../simulation/xplane/aircraftmodelloaderxplane.cpp | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/blackgui/components/cockpitcomponent.cpp b/src/blackgui/components/cockpitcomponent.cpp index 6dfe69eec..6fecc2245 100644 --- a/src/blackgui/components/cockpitcomponent.cpp +++ b/src/blackgui/components/cockpitcomponent.cpp @@ -21,7 +21,6 @@ namespace BlackGui { namespace Components { - CCockpitComponent::CCockpitComponent(QWidget *parent) : QWidget(parent), CEnableForDockWidgetInfoArea(), diff --git a/src/blackgui/components/settingssimulatorbasicscomponent.ui b/src/blackgui/components/settingssimulatorbasicscomponent.ui index ca9419c1f..b4b3f711e 100644 --- a/src/blackgui/components/settingssimulatorbasicscomponent.ui +++ b/src/blackgui/components/settingssimulatorbasicscomponent.ui @@ -71,7 +71,7 @@ - Simulator directory; + Simulator directory: diff --git a/src/blackmisc/identifier.cpp b/src/blackmisc/identifier.cpp index 1731c9788..09a5a3348 100644 --- a/src/blackmisc/identifier.cpp +++ b/src/blackmisc/identifier.cpp @@ -12,6 +12,7 @@ #include #include #include +#include namespace BlackMisc { @@ -76,11 +77,11 @@ namespace BlackMisc QString CIdentifier::convertToQString(bool i18n) const { Q_UNUSED(i18n); - QString s(m_name); - s.append(" ").append(m_machineIdBase64); - s.append(" ").append(m_machineName); - s.append(" ").append(QString::number(m_processId)); - s.append(" ").append(m_processName); + const QString s = m_name % + QLatin1Char(' ') % m_machineIdBase64 % + QLatin1Char(' ') % m_machineName % + QLatin1Char(' ') % QString::number(m_processId) % + QLatin1Char(' ') % m_processName; return s; } @@ -120,5 +121,4 @@ namespace BlackMisc { CValueObject::setPropertyByIndex(index, variant); } - } // ns diff --git a/src/blackmisc/simulation/data/modelcaches.h b/src/blackmisc/simulation/data/modelcaches.h index 2430bc251..639f0d1c5 100644 --- a/src/blackmisc/simulation/data/modelcaches.h +++ b/src/blackmisc/simulation/data/modelcaches.h @@ -158,7 +158,7 @@ namespace BlackMisc //! \threadsafe virtual QDateTime getCacheTimestamp(const BlackMisc::Simulation::CSimulatorInfo &simulator) const = 0; - //! Initilaized caches for which simulator + //! Initialized caches for which simulator? //! \threadsafe BlackMisc::Simulation::CSimulatorInfo simulatorsWithInitializedCache() const; diff --git a/src/blackmisc/simulation/fscommon/fscommonutil.cpp b/src/blackmisc/simulation/fscommon/fscommonutil.cpp index 816bbc188..7808027cb 100644 --- a/src/blackmisc/simulation/fscommon/fscommonutil.cpp +++ b/src/blackmisc/simulation/fscommon/fscommonutil.cpp @@ -74,6 +74,7 @@ namespace BlackMisc }); if (!CBuildConfig::isShippedVersion()) { + // developer directories someDefaultDirs.push_back("P:/FSX (MSI)"); } return CFileUtils::findFirstExisting(someDefaultDirs); diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index 804759bd0..93522fdee 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -127,11 +128,10 @@ namespace BlackMisc QString CAircraftModelLoaderXPlane::CSLPlane::getModelName() const { - QString modelName = dirNames.join(' '); - modelName += " "; - modelName += objectName; - modelName += " "; - modelName += textureName; + const QString modelName = + dirNames.join(' ') % + QLatin1Char(' ') % objectName % + QLatin1Char(' ') % textureName; return modelName; }