refactor: clang format line length

Author: ltoenning

.clang-format

@@ -34,7 +34,7 @@ BreakBeforeBraces: Custom
 BreakInheritanceList: AfterColon
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: BeforeColon
-ColumnLimit:     0 # Leave line length untouched
+ColumnLimit:     120
 Cpp11BracedListStyle: false
 FixNamespaceComments: true
 IncludeBlocks:   Regroup

samples/afvclient/afvclientbridge.cpp

@@ -5,12 +5,12 @@
 
 using namespace swift::core::afv::clients;
 
-CAfvClientBridge::CAfvClientBridge(CAfvClient *afvClient, QObject *parent) : QObject(parent),
-                                                                             m_afvClient(afvClient)
+CAfvClientBridge::CAfvClientBridge(CAfvClient *afvClient, QObject *parent) : QObject(parent), m_afvClient(afvClient)
 {
     connect(afvClient, &CAfvClient::receivingCallsignsChanged, this, &CAfvClientBridge::receivingCallsignsChanged);
     connect(afvClient, &CAfvClient::connectionStatusChanged, this, &CAfvClientBridge::connectionStatusChanged);
-    connect(afvClient, &CAfvClient::updatedFromOwnAircraftCockpit, this, &CAfvClientBridge::updatedFromOwnAircraftCockpit);
+    connect(afvClient, &CAfvClient::updatedFromOwnAircraftCockpit, this,
+            &CAfvClientBridge::updatedFromOwnAircraftCockpit);
     connect(afvClient, &CAfvClient::ptt, this, &CAfvClientBridge::ptt);
     connect(afvClient, &CAfvClient::inputVolumePeakVU, this, &CAfvClientBridge::inputVolumePeakVU);
     connect(afvClient, &CAfvClient::outputVolumePeakVU, this, &CAfvClientBridge::outputVolumePeakVU);

samples/afvclient/afvclientbridge.h

@@ -19,7 +19,8 @@ class CAfvClientBridge : public QObject
     //! @{
     Q_PROPERTY(double inputVolumePeakVU READ getInputVolumePeakVU NOTIFY inputVolumePeakVU)
     Q_PROPERTY(double outputVolumePeakVU READ getOutputVolumePeakVU NOTIFY outputVolumePeakVU)
-    Q_PROPERTY(swift::core::afv::clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY connectionStatusChanged)
+    Q_PROPERTY(swift::core::afv::clients::CAfvClient::ConnectionStatus connectionStatus READ getConnectionStatus NOTIFY
+                   connectionStatusChanged)
     Q_PROPERTY(QString receivingCallsignsCom1 READ getReceivingCallsignsCom1 NOTIFY receivingCallsignsChanged)
     Q_PROPERTY(QString receivingCallsignsCom2 READ getReceivingCallsignsCom2 NOTIFY receivingCallsignsChanged)
     //! @}
@@ -66,13 +67,19 @@ class CAfvClientBridge : public QObject
     Q_INVOKABLE void setBypassEffects(bool value) { m_afvClient->setBypassEffects(value); }
 
     //! \copydoc swift::core::afv::clients::CAfvClient::startAudio
-    Q_INVOKABLE void startAudio(const QString &inputDeviceName, const QString &outputDeviceName) { m_afvClient->startAudio(inputDeviceName, outputDeviceName); }
+    Q_INVOKABLE void startAudio(const QString &inputDeviceName, const QString &outputDeviceName)
+    {
+        m_afvClient->startAudio(inputDeviceName, outputDeviceName);
+    }
 
     //! \copydoc swift::core::afv::clients::CAfvClient::enableTransceiver
     Q_INVOKABLE void enableTransceiver(quint16 id, bool enable) { m_afvClient->enableTransceiver(id, enable); }
 
     //! \copydoc swift::core::afv::clients::CAfvClient::updateComFrequency
-    Q_INVOKABLE void updateComFrequency(quint16 id, quint32 frequencyHz) { m_afvClient->updateComFrequency(id, frequencyHz); }
+    Q_INVOKABLE void updateComFrequency(quint16 id, quint32 frequencyHz)
+    {
+        m_afvClient->updateComFrequency(id, frequencyHz);
+    }
 
     //! \copydoc swift::core::afv::clients::CAfvClient::updatePosition
     Q_INVOKABLE void updatePosition(double latitudeDeg, double longitudeDeg, double heightMeters)
@@ -93,7 +100,10 @@ class CAfvClientBridge : public QObject
     Q_INVOKABLE void setInputVolumeDb(double valueDb) { m_afvClient->setInputVolumeDb(valueDb); }
 
     //! \copydoc swift::core::afv::clients::CAfvClient::setNormalizedMasterOutputVolume
-    Q_INVOKABLE void setNormalizedMasterOutputVolume(double valueDb) { m_afvClient->setNormalizedMasterOutputVolume(valueDb); }
+    Q_INVOKABLE void setNormalizedMasterOutputVolume(double valueDb)
+    {
+        m_afvClient->setNormalizedMasterOutputVolume(valueDb);
+    }
 
 signals:
     //! Receiving callsigns have been changed

samples/afvclient/main.cpp

@@ -41,9 +41,7 @@ int main(int argc, char *argv[])
     voiceClient->start(QThread::TimeCriticalPriority); // background thread
     CAfvClientBridge *voiceClientBridge = new CAfvClientBridge(voiceClient, &qa);
 
-    QObject::connect(&qa, &QCoreApplication::aboutToQuit, [voiceClient]() {
-        voiceClient->quitAndWait();
-    });
+    QObject::connect(&qa, &QCoreApplication::aboutToQuit, [voiceClient]() { voiceClient->quitAndWait(); });
 
     // default user name
     QString defaultUserName("1234567");

samples/fsd/main.cpp

@@ -22,7 +22,8 @@ int main(int argc, char *argv[])
     QCoreApplication qa(argc, argv);
     COwnAircraftProviderDummy::instance()->updateOwnCallsign("BER368");
 
-    CFSDClient client(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(), CRemoteAircraftProviderDummy::instance(), &qa);
+    CFSDClient client(CClientProviderDummy::instance(), COwnAircraftProviderDummy::instance(),
+                      CRemoteAircraftProviderDummy::instance(), &qa);
     client.setClientName("Test Client");
     client.setHostApplication("None");
     client.setVersion(0, 8);
@@ -48,8 +49,8 @@ int main(int argc, char *argv[])
     client.sendFsdMessage("$CRLOWW_F_APP:LHA449:ATIS:E:6\r\n");
     client.sendFsdMessage("$CRN1234:BAW345:CAPS:INTERIMPOS=1:MODELDESC=1:ATCINFO=1:STEALTH=1:ACCONFIG=1\r\n");
     client.sendFsdMessage("#SBBAW106:LHA449:PI:GEN:EQUIPMENT=B744:AIRLINE=BAW:LIVERY=UNION\r\n");
-    client.sendFsdMessage("#SBGEC55F:DESWL:FSIPIR:1::MD11:12.93209:-0.01354:3648.00000:4.CB8FB1E0.984745A0::PMDG MD-11F Lufthansa Cargo WOW\r\n");
-    client.sendFsdMessage("#TMAFR529:@20500&@26000:taxi to entry N1 via M A4\r\n");
+    client.sendFsdMessage("#SBGEC55F:DESWL:FSIPIR:1::MD11:12.93209:-0.01354:3648.00000:4.CB8FB1E0.984745A0::PMDG MD-11F
+    Lufthansa Cargo WOW\r\n"); client.sendFsdMessage("#TMAFR529:@20500&@26000:taxi to entry N1 via M A4\r\n");
     client.sendFsdMessage("$CQDLH123:BER368:ACC:json config\r\n");
     client.sendFsdMessage("$CQDLH123:@94836:ACC:{\"request\":\"full\"}\r\n");
     client.sendFsdMessage("#SBAUA417C:LHA449:PI:X:0:1:~B737");

samples/misc/main.cpp

@@ -37,8 +37,7 @@ int main(int argc, char *argv[])
     QTextStream qtout(stdout);
     QTextStream qtin(stdin);
 
-    do
-    {
+    do {
         qtout << Qt::endl;
         qtout << "1 .. JSON" << Qt::endl;
         qtout << "2 .. Change object" << Qt::endl;

samples/misc/samplesalgorithm.cpp

@@ -29,10 +29,7 @@ namespace swift::sample
     int CSamplesAlgorithm::samples()
     {
         swift::misc::CSequence<int> seq;
-        for (int i = 1; i <= 100; ++i)
-        {
-            seq.push_back(i);
-        }
+        for (int i = 1; i <= 100; ++i) { seq.push_back(i); }
         const int samples = 200;
         swift::misc::CSequence<int> means;
         {
@@ -42,7 +39,9 @@ namespace swift::sample
                 means.push_back(std::accumulate(randoms.cbegin(), randoms.cend(), 0) / 10);
             }
             int mean = std::accumulate(means.cbegin(), means.cend(), 0) / samples;
-            int stdDev = std::sqrt(std::accumulate(means.cbegin(), means.cend(), 0, [&](int a, int n) { return a + (n - mean) * (n - mean); }) / samples);
+            int stdDev = std::sqrt(std::accumulate(means.cbegin(), means.cend(), 0,
+                                                   [&](int a, int n) { return a + (n - mean) * (n - mean); }) /
+                                   samples);
             qDebug() << "randomElements";
             qDebug() << "means:" << means;
             qDebug() << "mean of the means:" << mean;
@@ -56,7 +55,9 @@ namespace swift::sample
                 means.push_back(std::accumulate(randoms.cbegin(), randoms.cend(), 0) / 10);
             }
             int mean = std::accumulate(means.cbegin(), means.cend(), 0) / samples;
-            int stdDev = std::sqrt(std::accumulate(means.cbegin(), means.cend(), 0, [&](int a, int n) { return a + (n - mean) * (n - mean); }) / samples);
+            int stdDev = std::sqrt(std::accumulate(means.cbegin(), means.cend(), 0,
+                                                   [&](int a, int n) { return a + (n - mean) * (n - mean); }) /
+                                   samples);
             qDebug() << "sampleElements";
             qDebug() << "means:" << means;
             qDebug() << "mean of the means:" << mean;
@@ -69,7 +70,10 @@ namespace swift::sample
         qDebug() << "topologicallySortedInsert";
         QStringList dst;
         int count = 0;
-        auto cmp = [&](const QString &a, const QString &b) { count++; return a[0] == b[0] && a[1] < b[1]; };
+        auto cmp = [&](const QString &a, const QString &b) {
+            count++;
+            return a[0] == b[0] && a[1] < b[1];
+        };
         for (const auto &s : src) { swift::misc::topologicallySortedInsert(dst, s, cmp); }
         qDebug() << count << "comparisons";
         qDebug() << dst;

samples/misc/sampleschangeobject.cpp

@@ -32,14 +32,15 @@ namespace swift::sample
     int CSamplesChangeObject::samples()
     {
         // ATC station
-        const CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", { 1487, CLengthUnit::ft() });
+        const CCoordinateGeodetic geoPos =
+            CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", { 1487, CLengthUnit::ft() });
         const CAtcStation station1(CCallsign("eddm_twr"), CUser("123456", "Joe Doe"),
-                                   CFrequency(118.7, CFrequencyUnit::MHz()),
-                                   geoPos, CLength(50, CLengthUnit::km()), false);
+                                   CFrequency(118.7, CFrequencyUnit::MHz()), geoPos, CLength(50, CLengthUnit::km()),
+                                   false);
         const CAtcStation station2(station1);
         const CAtcStation station3(CCallsign("eddm_app"), CUser("654321", "Jen Doe"),
-                                   CFrequency(120.7, CFrequencyUnit::MHz()),
-                                   geoPos, CLength(100, CLengthUnit::km()), false);
+                                   CFrequency(120.7, CFrequencyUnit::MHz()), geoPos, CLength(100, CLengthUnit::km()),
+                                   false);
 
         Q_ASSERT_X(station1 == station2, Q_FUNC_INFO, "Unequal stations");
 
@@ -57,9 +58,8 @@ namespace swift::sample
         // put Jane in the tower
         CPropertyIndexVariantMap newController;
         newController.addValue(CAtcStation::IndexController, CVariant::fromValue(CUser("112233", "Jane Doe")));
-        atcList.applyIf(
-            swift::misc::predicates::MemberEqual(&CAtcStation::getCallsign, CCallsign("eddm_twr")),
-            newController);
+        atcList.applyIf(swift::misc::predicates::MemberEqual(&CAtcStation::getCallsign, CCallsign("eddm_twr")),
+                        newController);
         qDebug() << "-- after update via predicates";
         qDebug() << atcList.toQString();
 

samples/misc/samplescontainer.cpp

@@ -53,7 +53,8 @@ namespace swift::sample
         qDebug() << "-- list:";
         qDebug() << atcList.toQString();
 
-        CAtcStationList atcListFind = atcList.findBy(&CAtcStation::getCallsign, "eddm_twr", &CAtcStation::getFrequency, CFrequency(118.7, CFrequencyUnit::MHz()));
+        CAtcStationList atcListFind = atcList.findBy(&CAtcStation::getCallsign, "eddm_twr", &CAtcStation::getFrequency,
+                                                     CFrequency(118.7, CFrequencyUnit::MHz()));
         qDebug() << "-- find by:";
         qDebug() << atcListFind.toQString();
 

samples/misc/samplesjson.cpp

@@ -67,7 +67,8 @@ namespace swift::sample
         qDebug() << "------- Enter -----";
         cin.readLine();
 
-        CSimulatedAircraft aircraft(CCallsign("DAMBZ"), CUser("123456", "Joe Pilot"), CTestData::getAircraftSituationAboveMunichTower());
+        CSimulatedAircraft aircraft(CCallsign("DAMBZ"), CUser("123456", "Joe Pilot"),
+                                    CTestData::getAircraftSituationAboveMunichTower());
         aircraft.setCom1System(CComSystem::getCom1System(122.8, 118.75));
         aircraft.setCom2System(CComSystem::getCom2System(123.8, 124.00));
         aircraft.setTransponder(CTransponder::getStandardTransponder(7000, CTransponder::ModeC));