Ref T338, style

src/blackcore/context/contextnetworkimpl.cpp

@@ -376,7 +376,7 @@ namespace BlackCore
 
                 const bool added = this->testAddAltitudeOffset(cs, os);
                 if (added) { CLogMessage(this).info("Added altitude offset %1 for %2") << os.valueRoundedWithUnit(2) << cs.asString(); }
-                else { CLogMessage(this).info("Removed altitude offset %1") << cs.asString(); }
+                else       { CLogMessage(this).info("Removed altitude offset %1") << cs.asString(); }
 
                 return true;
             }

src/blackgui/components/copymodelsfromotherswiftversionscomponent.cpp

@@ -161,7 +161,7 @@ namespace BlackGui
                 sApp->processEventsFor(50);
                 return true;
             }
-            const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Confirm override"), withQUestionMark(msg), QMessageBox::Yes | QMessageBox::No);
+            const QMessageBox::StandardButton reply = QMessageBox::question(this, QStringLiteral("Confirm override"), withQuestionMark(msg), QMessageBox::Yes | QMessageBox::No);
             return reply == QMessageBox::Yes;
         }
 

src/blackgui/components/textmessagecomponent.cpp

@@ -318,7 +318,7 @@ namespace BlackGui
 
         QWidget *CTextMessageComponent::findTextMessageTabByCallsign(const CCallsign &callsign, bool callsignResolution) const
         {
-            QWidget *w = findTextMessageTabByName(callsign.asString());
+            QWidget *w = this->findTextMessageTabByName(callsign.asString());
             if (w) { return w; }
             if (!callsignResolution) { return nullptr; }
 

src/blackmisc/aviation/comsystem.cpp

@@ -70,18 +70,18 @@ namespace BlackMisc
         void CComSystem::setActiveUnicom()
         {
             this->toggleActiveStandby();
-            this->setFrequencyActive(BlackMisc::PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyUnicom());
+            this->setFrequencyActive(PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyUnicom());
         }
 
         void CComSystem::setActiveInternationalAirDistress()
         {
             this->toggleActiveStandby();
-            this->setFrequencyActive(BlackMisc::PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress());
+            this->setFrequencyActive(PhysicalQuantities::CPhysicalQuantitiesConstants::FrequencyInternationalAirDistress());
         }
 
         CComSystem CComSystem::getCom1System(double activeFrequencyMHz, double standbyFrequencyMHz)
         {
-            return CComSystem(CModulator::NameCom1(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
+            return CComSystem(CModulator::NameCom1(), PhysicalQuantities::CFrequency(activeFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()));
         }
 
         CComSystem CComSystem::getCom1System(const CFrequency &activeFrequency, const CFrequency &standbyFrequency)
@@ -91,7 +91,7 @@ namespace BlackMisc
 
         CComSystem CComSystem::getCom2System(double activeFrequencyMHz, double standbyFrequencyMHz)
         {
-            return CComSystem(CModulator::NameCom2(), BlackMisc::PhysicalQuantities::CFrequency(activeFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()), BlackMisc::PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, BlackMisc::PhysicalQuantities::CFrequencyUnit::MHz()));
+            return CComSystem(CModulator::NameCom2(), PhysicalQuantities::CFrequency(activeFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()), PhysicalQuantities::CFrequency(standbyFrequencyMHz < 0 ? activeFrequencyMHz : standbyFrequencyMHz, PhysicalQuantities::CFrequencyUnit::MHz()));
         }
 
         CComSystem CComSystem::getCom2System(const CFrequency &activeFrequency, const CFrequency &standbyFrequency)

src/blackmisc/pq/frequency.h

@@ -19,7 +19,6 @@ namespace BlackMisc
 {
     namespace PhysicalQuantities
     {
-
         /*!
          * Physical unit frequency
          */

src/blackmisc/pq/measurementunit.cpp

@@ -20,7 +20,7 @@ namespace BlackMisc
         bool CMeasurementUnit::operator ==(const CMeasurementUnit &other) const
         {
             if (this == &other) return true;
-            return this->m_data->m_name == other.m_data->m_name;
+            return m_data->m_name == other.m_data->m_name;
         }
 
         bool CMeasurementUnit::operator !=(const CMeasurementUnit &other) const
@@ -31,8 +31,8 @@ namespace BlackMisc
         double CMeasurementUnit::convertFrom(double value, const CMeasurementUnit &unit) const
         {
             if (this->isNull() || unit.isNull()) return 0;
-            if (this->m_data->m_toDefault == unit.m_data->m_toDefault && this->m_data->m_fromDefault == unit.m_data->m_fromDefault) return value;
+            if (m_data->m_toDefault == unit.m_data->m_toDefault && m_data->m_fromDefault == unit.m_data->m_fromDefault) return value;
-            return this->m_data->m_fromDefault(unit.m_data->m_toDefault(value));
+            return m_data->m_fromDefault(unit.m_data->m_toDefault(value));
         }
 
         QString CMeasurementUnit::makeRoundedQStringWithUnit(double value, int digits, bool i18n) const
@@ -42,7 +42,7 @@ namespace BlackMisc
 
         double CMeasurementUnit::roundValue(double value, int digits) const
         {
-            if (digits < 0) { digits = this->m_data->m_displayDigits; }
+            if (digits < 0) { digits = m_data->m_displayDigits; }
             return CMathUtils::round(value, digits);
         }
 
@@ -55,7 +55,7 @@ namespace BlackMisc
         QString CMeasurementUnit::makeRoundedQString(double value, int digits, bool i18n) const
         {
             Q_UNUSED(i18n);
-            if (digits < 0) digits = this->m_data->m_displayDigits;
+            if (digits < 0) digits = m_data->m_displayDigits;
             const double v = CMathUtils::round(value, digits);
             const QString s = QLocale::system().toString(v, 'f', digits);
             return s;

src/blackmisc/pq/measurementunit.h

@@ -255,7 +255,7 @@ namespace BlackMisc
             //! \copydoc BlackMisc::Mixin::DBusByMetaClass::marshallToDbus
             void marshallToDbus(QDBusArgument &argument) const
             {
-                argument << this->m_data->m_symbol;
+                argument << m_data->m_symbol;
             }
 
             //! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
@@ -281,13 +281,13 @@ namespace BlackMisc
             //! Name such as "meter"
             QString getName(bool i18n = false) const
             {
-                return i18n ? QCoreApplication::translate("CMeasurementUnit", this->m_data->m_name.latin1()) : this->m_data->m_name;
+                return i18n ? QCoreApplication::translate("CMeasurementUnit", m_data->m_name.latin1()) : m_data->m_name;
             }
 
             //! Unit name such as "m"
             QString getSymbol(bool i18n = false) const
             {
-                return i18n ? QCoreApplication::translate("CMeasurementUnit", this->m_data->m_symbol.latin1()) : this->m_data->m_symbol;
+                return i18n ? QCoreApplication::translate("CMeasurementUnit", m_data->m_symbol.latin1()) : m_data->m_symbol;
             }
 
             //! Does a string end with name or symbol? E.g. 3meter, 3m, 3deg
@@ -317,13 +317,13 @@ namespace BlackMisc
             //! Threshold for comparions
             double getEpsilon() const
             {
-                return this->m_data->m_epsilon;
+                return m_data->m_epsilon;
             }
 
             //! Display digits
             int getDisplayDigits() const
             {
-                return this->m_data->m_displayDigits;
+                return m_data->m_displayDigits;
             }
 
             //! Convert from other unit to this unit.
@@ -334,13 +334,13 @@ namespace BlackMisc
             {
                 if (this->isNull()) return false;
                 if (qFuzzyIsNull(value)) return true;
-                return std::abs(value) <= this->m_data->m_epsilon;
+                return std::abs(value) <= m_data->m_epsilon;
             }
 
             //! Is unit null?
             bool isNull() const
             {
-                return this->m_data->m_toDefault == nullptr;
+                return m_data->m_toDefault == nullptr;
             }
 
             // --------------------------------------------------------------------

src/blackmisc/pq/physicalquantity.cpp

@@ -7,15 +7,10 @@
  * contained in the LICENSE file.
  */
 
-#include "blackmisc/comparefunctions.h"
-#include "blackmisc/dictionary.h"
 #include "blackmisc/pq/measurementunit.h"
 #include "blackmisc/pq/physicalquantity.h"
 #include "blackmisc/pq/pqstring.h"
 #include "blackmisc/propertyindex.h"
-#include "blackmisc/propertyindexvariantmap.h"
-#include "blackmisc/variant.h"
-#include "blackmisc/verify.h"
 #include "blackmisc/pq/length.h"
 #include "blackmisc/pq/pressure.h"
 #include "blackmisc/pq/frequency.h"
@@ -25,6 +20,11 @@
 #include "blackmisc/pq/angle.h"
 #include "blackmisc/pq/time.h"
 #include "blackmisc/pq/acceleration.h"
+#include "blackmisc/propertyindexvariantmap.h"
+#include "blackmisc/comparefunctions.h"
+#include "blackmisc/dictionary.h"
+#include "blackmisc/variant.h"
+#include "blackmisc/verify.h"
 
 #include <QCoreApplication>
 #include <QDBusArgument>
@@ -432,7 +432,7 @@ namespace BlackMisc
         {
             const QJsonValue unit = json.value("unit");
             const QJsonValue value = json.value("value");
-            if (unit.isUndefined()) { throw CJsonException("Missing 'unit'"); }
+            if (unit.isUndefined())  { throw CJsonException("Missing 'unit'"); }
             if (value.isUndefined()) { throw CJsonException("Missing 'value'"); }
 
             this->setUnitBySymbol(unit.toString());

src/blackmisc/pq/pqstring.h

@@ -38,8 +38,8 @@ namespace BlackMisc
             //! Number separators / group separators
             enum SeparatorMode
             {
-                SeparatorsCLocale, //!< 100,000.00
+                SeparatorsCLocale,  //!< 100,000.00
-                SeparatorsLocale, //!< depending on QLocale, e.g. 100.000,00 in Germany
+                SeparatorsLocale,   //!< depending on QLocale, e.g. 100.000,00 in Germany
                 SeparatorsBestGuess //!< try to figure out
             };
 

src/blackmisc/stringutils.cpp

@@ -390,7 +390,7 @@ namespace BlackMisc
         return QStringLiteral("\"") % in % QStringLiteral("\"");
     }
 
-    QString withQUestionMark(const QString &question)
+    QString withQuestionMark(const QString &question)
     {
         if (question.endsWith("?")) { return question; }
         return question % QStringLiteral("?");

src/blackmisc/stringutils.h

@@ -193,7 +193,7 @@ namespace BlackMisc
     BLACKMISC_EXPORT QString simplifyNameForSearch(const QString &name);
 
     //! Add a question mark at the end if not existing
-    BLACKMISC_EXPORT QString withQUestionMark(const QString &question);
+    BLACKMISC_EXPORT QString withQuestionMark(const QString &question);
 
     //! Same as QDateTime::fromString but QDateTime will be set to UTC
     //! \remark potentially slow, so only to be used when format is unknown