Fix clang-tidy and clazy warnings

2026-04-28 11:45:40 +08:00 · 2021-08-27 16:21:41 +01:00
parent 2aeacf49a7
commit eb6b0ff289
122 changed files with 197 additions and 205 deletions
--- a/src/blackgui/components/aircraftcombinedtypeselector.cpp
+++ b/src/blackgui/components/aircraftcombinedtypeselector.cpp
@@ -48,7 +48,7 @@ namespace BlackGui
            if (m_cc == cc) { return; }
            m_cc = cc;

-            if (cc.length() > 0) { aircraftType = cc.left(1); }
+            if (cc.length() > 0) { aircraftType = cc.at(0); }
            if (cc.length() > 1) { engineCount  = cc.mid(1, 1); }
            if (cc.length() > 2) { engineType   = cc.mid(2, 1); }

--- a/src/blackgui/components/airportcompleter.cpp
+++ b/src/blackgui/components/airportcompleter.cpp
@@ -94,7 +94,7 @@ namespace BlackGui

        void CAirportCompleter::onAirportsChanged()
        {
-            if (!sGui && !sGui->hasWebDataServices()) { return; }
+            if (!sGui || !sGui->hasWebDataServices()) { return; }
            const CAirportList airports = sGui->getWebDataServices()->getAirports();
            ui->le_Icao->setCompleter(new QCompleter(airports.allIcaoCodes(true), ui->le_Icao));
            ui->le_Name->setCompleter(new QCompleter(airports.allDescriptivesNames(true), ui->le_Name));
--- a/src/blackgui/components/airportsmallcompleter.cpp
+++ b/src/blackgui/components/airportsmallcompleter.cpp
@@ -104,7 +104,7 @@ namespace BlackGui

        void CAirportSmallCompleter::onIcaoChanged()
        {
-            if (!sGui && !sGui->hasWebDataServices()) { return; }
+            if (!sGui || !sGui->hasWebDataServices()) { return; }
            const CAirport airport = sGui->getWebDataServices()->getAirportForIcaoDesignator(this->getIcaoText());
            if (!airport.isNull())
            {
@@ -114,7 +114,7 @@ namespace BlackGui

        void CAirportSmallCompleter::onAirportsChanged()
        {
-            if (!sGui && !sGui->hasWebDataServices()) { return; }
+            if (!sGui || !sGui->hasWebDataServices()) { return; }
            const CAirportList airports = sGui->getWebDataServices()->getAirports();
            ui->le_Icao->setCompleter(new QCompleter(airports.allIcaoCodes(true), ui->le_Icao));

--- a/src/blackgui/components/atcstationcomponent.cpp
+++ b/src/blackgui/components/atcstationcomponent.cpp
@@ -536,7 +536,7 @@ namespace BlackGui
        void CAtcStationComponent::showOverlayInlineTextMessage()
        {
            // COverlayMessagesFrame::showOverlayInlineTextMessage(TextMessagesCom1);
-            this->requestTextMessageEntryTab(TextMessagesCom1);
+            emit requestTextMessageEntryTab(TextMessagesCom1);
        }

        void CAtcStationComponent::onDetailsToggled(bool checked)
--- a/src/blackgui/components/cockpitcomponent.cpp
+++ b/src/blackgui/components/cockpitcomponent.cpp
@@ -120,18 +120,18 @@ namespace BlackGui

        void CCockpitComponent::mouseDoubleClickEvent(QMouseEvent *event)
        {
-            if (event) { this->requestTextMessageEntryTab(TextMessagesAll); }
+            if (event) { emit requestTextMessageEntryTab(TextMessagesAll); }
            COverlayMessagesFrame::mouseDoubleClickEvent(event);
        }

        void CCockpitComponent::onRequestTextMessageCom1()
        {
-            this->requestTextMessageEntryTab(TextMessagesCom1);
+            emit requestTextMessageEntryTab(TextMessagesCom1);
        }

        void CCockpitComponent::onRequestTextMessageCom2()
        {
-            this->requestTextMessageEntryTab(TextMessagesCom2);
+            emit requestTextMessageEntryTab(TextMessagesCom2);
        }

        void CCockpitComponent::onATCStationsChanged()
--- a/src/blackgui/components/colorselector.cpp
+++ b/src/blackgui/components/colorselector.cpp
@@ -83,7 +83,7 @@ namespace BlackGui
            this->setColor(CRgbColor(color));
        }

-        const BlackMisc::CRgbColor CColorSelector::getColor() const
+        BlackMisc::CRgbColor CColorSelector::getColor() const
        {
            CRgbColor q(ui->le_Color->text());
            return q;
--- a/src/blackgui/components/colorselector.h
+++ b/src/blackgui/components/colorselector.h
@@ -54,7 +54,7 @@ namespace BlackGui
            void setColor(const QColor &color);

            //! Selected color
-            const BlackMisc::CRgbColor getColor() const;
+            BlackMisc::CRgbColor getColor() const;

            //! Read only
            void setReadOnly(bool readOnly);
--- a/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
+++ b/src/blackgui/components/dbaircrafticaoselectorcomponent.cpp
@@ -54,9 +54,8 @@ namespace BlackGui
            if (sApp && sApp->hasWebDataServices())
            {
                connect(sApp->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbAircraftIcaoSelectorComponent::onCodesRead, Qt::QueuedConnection);
+                this->onCodesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount());
            }
-
-            this->onCodesRead(CEntityFlags::AircraftIcaoEntity, CEntityFlags::ReadFinished, sApp->getWebDataServices()->getAircraftIcaoCodesCount());
        }

        CDbAircraftIcaoSelectorComponent::~CDbAircraftIcaoSelectorComponent()
--- a/src/blackgui/components/dbdistributorcomponent.cpp
+++ b/src/blackgui/components/dbdistributorcomponent.cpp
@@ -46,9 +46,8 @@ namespace BlackGui
            if (sGui && sGui->getWebDataServices())
            {
                connect(sGui->getWebDataServices(), &CWebDataServices::dataRead, this, &CDbDistributorComponent::onDistributorsRead, Qt::QueuedConnection);
+                this->onDistributorsRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getDistributorsCount());
            }
-
-            this->onDistributorsRead(CEntityFlags::DistributorEntity, CEntityFlags::ReadFinished, sGui->getWebDataServices()->getDistributorsCount());
        }

        CDbDistributorComponent::~CDbDistributorComponent()
--- a/src/blackgui/components/dblogincomponent.cpp
+++ b/src/blackgui/components/dblogincomponent.cpp
@@ -115,7 +115,7 @@ namespace BlackGui
                displayOverlayMessages(msgs);
                return;
            }
-            else if (!msgs.empty())
+            else if (!msgs.isEmpty())
            {
                CLogMessage::preformatted(msgs);
            }
--- a/src/blackgui/components/dbmappingcomponent.cpp
+++ b/src/blackgui/components/dbmappingcomponent.cpp
@@ -844,7 +844,7 @@ namespace BlackGui
            return ui->comp_OwnAircraftModels->getOwnModelForModelString(modelString);
        }

-        const CSimulatorInfo CDbMappingComponent::getOwnModelsSimulator() const
+        CSimulatorInfo CDbMappingComponent::getOwnModelsSimulator() const
        {
            return ui->comp_OwnAircraftModels->getOwnModelsSimulator();
        }
--- a/src/blackgui/components/dbmappingcomponent.h
+++ b/src/blackgui/components/dbmappingcomponent.h
@@ -153,7 +153,7 @@ namespace BlackGui
            BlackMisc::Simulation::CAircraftModel getOwnModelForModelString(const QString &modelString) const;

            //! Own models for simulator
-            const BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const;
+            BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const;

            //! Set simulator for own models
            void setOwnModelsSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator);
--- a/src/blackgui/components/dbownmodelscomponent.cpp
+++ b/src/blackgui/components/dbownmodelscomponent.cpp
@@ -145,7 +145,7 @@ namespace BlackGui
            return ui->tvp_OwnAircraftModels->selectedObjects();
        }

-        const CSimulatorInfo CDbOwnModelsComponent::getOwnModelsSimulator() const
+        CSimulatorInfo CDbOwnModelsComponent::getOwnModelsSimulator() const
        {
            return ui->comp_SimulatorSelector->getValue();
        }
--- a/src/blackgui/components/dbownmodelscomponent.h
+++ b/src/blackgui/components/dbownmodelscomponent.h
@@ -81,7 +81,7 @@ namespace BlackGui
            BlackMisc::Simulation::CAircraftModelList getOwnSelectedModels() const;

            //! Own models for simulator
-            const BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const;
+            BlackMisc::Simulation::CSimulatorInfo getOwnModelsSimulator() const;

            //! Change current simulator for own models
            bool setSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator, bool forced = false);
--- a/src/blackgui/components/downloadcomponent.cpp
+++ b/src/blackgui/components/downloadcomponent.cpp
@@ -262,7 +262,7 @@ namespace BlackGui
                if (!myself || !sGui || sGui->isShuttingDown()) { return; }
                myself->ui->pb_Download->setEnabled(true);
                myself->ui->pb_Launch->setEnabled(true);
-                this->allDownloadsCompleted();
+                emit allDownloadsCompleted();
            });
            this->startDownloadedExecutable();
        }
--- a/src/blackgui/components/loginoverviewcomponent.cpp
+++ b/src/blackgui/components/loginoverviewcomponent.cpp
@@ -143,11 +143,11 @@ namespace BlackGui
            CLogMessage::preformatted(msg);
            if (msg.isSuccess())
            {
-                emit this->loginOrLogoffSuccessful();
+                emit loginOrLogoffSuccessful();
            }
            else
            {
-                emit this->cancel();
+                this->cancel();
            }
        }

--- a/src/blackgui/components/mainkeypadareacomponent.cpp
+++ b/src/blackgui/components/mainkeypadareacomponent.cpp
@@ -87,7 +87,7 @@ namespace BlackGui
        CMainKeypadAreaComponent::~CMainKeypadAreaComponent()
        { }

-        void CMainKeypadAreaComponent::onMainInfoAreaChanged(int currentTabIndex, QList<int> dockedIndexes, QList<int> floatingIndexes)
+        void CMainKeypadAreaComponent::onMainInfoAreaChanged(int currentTabIndex, const QList<int> &dockedIndexes, const QList<int> &floatingIndexes)
        {
            this->unsetInfoAreaButtons();
            if (currentTabIndex >= 0)
--- a/src/blackgui/components/mainkeypadareacomponent.h
+++ b/src/blackgui/components/mainkeypadareacomponent.h
@@ -44,7 +44,7 @@ namespace BlackGui
            virtual ~CMainKeypadAreaComponent() override;

            //! Main info area changed
-            void onMainInfoAreaChanged(int currentTabIndex, QList<int> dockedIndexes, QList<int> floatingIndexes);
+            void onMainInfoAreaChanged(int currentTabIndex, const QList<int> &dockedIndexes, const QList<int> &floatingIndexes);

            //! Focus in entry fields
            void focusInEntryField();
--- a/src/blackgui/components/radarcomponent.cpp
+++ b/src/blackgui/components/radarcomponent.cpp
@@ -37,11 +37,11 @@ namespace BlackGui
            ui->gv_RadarView->setScene(&m_scene);

            ui->cb_RadarRange->addItem(QString::number(0.5) % u" nm", 0.5);
-            for (qreal r = 1.0; r < 10; r += 1)
+            for (int r = 1; r <= 9; ++r)
            {
                ui->cb_RadarRange->addItem(QString::number(r) % u" nm", r);
            }
-            for (qreal r = 10; r < 91; r += 10)
+            for (int r = 10; r <= 90; r += 10)
            {
                ui->cb_RadarRange->addItem(QString::number(r) % u" nm", r);
            }
@@ -110,7 +110,7 @@ namespace BlackGui
            pen.setCosmetic(true);

            // Macro graticule, drawn as full line at every 10 nm
-            for (qreal range = 10.0; range < 101.0; range += 10.0)
+            for (int range = 10; range <= 100; range += 10)
            {
                QGraphicsEllipseItem *circle = new QGraphicsEllipseItem(-range, -range, 2.0 * range, 2.0 * range, &m_macroGraticule);
                circle->setPen(pen);
@@ -119,9 +119,9 @@ namespace BlackGui
            pen.setCosmetic(true);

            // Micro graticule, drawn as dash line at every 2.5 nm
-            for (qreal range = 2.5; range < 9.9; range += 2.5)
+            for (qreal range = 1; range <= 3; ++range)
            {
-                QGraphicsEllipseItem *circle = new QGraphicsEllipseItem(-range, -range, 2.0 * range, 2.0 * range, &m_microGraticule);
+                QGraphicsEllipseItem *circle = new QGraphicsEllipseItem(-range * 2.5, -range * 2.5, 5.0 * range, 5.0 * range, &m_microGraticule);
                circle->setPen(pen);
            }
        }
@@ -131,9 +131,9 @@ namespace BlackGui
            QPen pen(Qt::gray, 1, Qt::DashDotDotLine);
            pen.setCosmetic(true);

-            for (qreal angle = 0.0; angle < 359.0; angle += 30.0)
+            for (int angle = 0; angle < 360; angle += 30)
            {
-                const QLineF line({ 0.0, 0.0 }, polarPoint(1000.0, qDegreesToRadians(angle)));
+                const QLineF line({ 0.0, 0.0 }, polarPoint(1000.0, qDegreesToRadians(static_cast<qreal>(angle))));
                QGraphicsLineItem *li = new QGraphicsLineItem(line, &m_radials);
                li->setFlags(QGraphicsItem::ItemIgnoresTransformations);
                li->setPen(pen);
--- a/src/blackgui/components/textmessagecomponent.cpp
+++ b/src/blackgui/components/textmessagecomponent.cpp
@@ -629,7 +629,6 @@ namespace BlackGui
        QWidget *CTextMessageComponent::findTextMessageTabByName(const QString &name) const
        {
            if (name.isEmpty()) { return nullptr; }
-            const QString n = name.trimmed();

            // search the private message tabs first
            for (int index = ui->tw_TextMessages->count() - 1; index >= 0; index--)
@@ -685,7 +684,7 @@ namespace BlackGui
            {
                const CCallsign cs(tab->property("callsign").toString());
                if (!validated) { return cs; }
-                if (!sGui && sGui->getIContextNetwork())
+                if (sGui && sGui->getIContextNetwork())
                {
                    const CAtcStation atc = sGui->getIContextNetwork()->getOnlineStationForCallsign(cs);
                    if (atc.hasCallsign()) { return atc.getCallsign(); } // first hand callsign diretcly from network context
--- a/src/blackgui/components/updateinfocomponent.cpp
+++ b/src/blackgui/components/updateinfocomponent.cpp
@@ -257,7 +257,7 @@ namespace BlackGui
            return CPlatform::stringToPlatformObject(p);
        }

-        const CDistribution CUpdateInfoComponent::getSelectedOrDefaultDistribution() const
+        CDistribution CUpdateInfoComponent::getSelectedOrDefaultDistribution() const
        {
            const QStringList settings = m_updateSettings.get(); // channel / platform
            QString c = ui->cb_Channels->currentText();
--- a/src/blackgui/components/updateinfocomponent.h
+++ b/src/blackgui/components/updateinfocomponent.h
@@ -99,7 +99,7 @@ namespace BlackGui
            const BlackMisc::CPlatform &getSelectedOrDefaultPlatform() const;

            //! Selected or default distribution
-            const BlackMisc::Db::CDistribution getSelectedOrDefaultDistribution() const;
+            BlackMisc::Db::CDistribution getSelectedOrDefaultDistribution() const;
        };
    } // ns
 } // ns
--- a/src/blackgui/dockwidgetinfoarea.cpp
+++ b/src/blackgui/dockwidgetinfoarea.cpp
@@ -146,7 +146,7 @@ namespace BlackGui
        return nestedInfoAreas;
    }

-    const QList<const CInfoArea *> CDockWidgetInfoArea::findParentInfoAreas() const
+    QList<const CInfoArea *> CDockWidgetInfoArea::findParentInfoAreas() const
    {
        QList<const CInfoArea *> parents;
        QWidget *currentWidget = this->parentWidget();
--- a/src/blackgui/dockwidgetinfoarea.h
+++ b/src/blackgui/dockwidgetinfoarea.h
@@ -64,7 +64,7 @@ namespace BlackGui
        QList<CDockWidgetInfoArea *> findNestedInfoAreas();

        //! The parent info areas
-        const QList<const CInfoArea *> findParentInfoAreas() const;
+        QList<const CInfoArea *> findParentInfoAreas() const;
    };
 } // namespace

--- a/src/blackgui/graphs/barchart.cpp
+++ b/src/blackgui/graphs/barchart.cpp
@@ -107,7 +107,7 @@ namespace BlackGui

        void CBarChart::setSymbols(const QStringList &titles, const QStringList &colors)
        {
-            Q_ASSERT_X(titles.size() > 0, Q_FUNC_INFO, "Need titles");
+            Q_ASSERT_X(!titles.isEmpty(), Q_FUNC_INFO, "Need titles");
            Q_ASSERT_X(titles.size() == colors.size(), Q_FUNC_INFO, "Need same size");

            int i = 0;
@@ -135,9 +135,7 @@ namespace BlackGui
            QVector< QVector<double> > series;
            for (double d : samples)
            {
-                QVector<double> values;
-                values << d;
-                series << values;
+                series << QVector<double> { d };
            }

            if (orientation == Qt::Vertical)
--- a/src/blackgui/guiapplication.cpp
+++ b/src/blackgui/guiapplication.cpp
@@ -385,7 +385,7 @@ namespace BlackGui
    {
        const QWidget *w = CGuiApplication::mainApplicationWidget();
        const int s = QApplication::desktop()->screenNumber(w);
-        if (s < QGuiApplication::screens().size()) { return QGuiApplication::screens()[s]; }
+        if (s < QGuiApplication::screens().size()) { return QGuiApplication::screens().at(s); }
        return QGuiApplication::primaryScreen();
    }

@@ -1039,7 +1039,7 @@ namespace BlackGui
    {
        if (this->isShuttingDown()) { return; }
        if (!qObject || qObject->objectName().isEmpty()) { this->showHelp(); }
-        this->showHelp(qObject->objectName());
+        else { this->showHelp(qObject->objectName()); }
    }

    bool CGuiApplication::triggerShowHelp(const QWidget *widget, QEvent *event)
--- a/src/blackgui/guiutility.cpp
+++ b/src/blackgui/guiutility.cpp
@@ -263,22 +263,22 @@ namespace BlackGui
        return unknown;
    }

-    const QString CGuiUtility::rectAsString(const QRect &rect)
+    QString CGuiUtility::rectAsString(const QRect &rect)
    {
        return QStringLiteral("x: %1 y: %2 w: %3 h: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height());
    }

-    const QString CGuiUtility::rectAsString(const QRectF &rect)
+    QString CGuiUtility::rectAsString(const QRectF &rect)
    {
        return QStringLiteral("x: %1 y: %2 w: %3 h: %4").arg(rect.x()).arg(rect.y()).arg(rect.width()).arg(rect.height());
    }

-    const QString CGuiUtility::sizeAsString(const QSize &size)
+    QString CGuiUtility::sizeAsString(const QSize &size)
    {
        return QStringLiteral("w: %1 h: %2").arg(size.width()).arg(size.height());
    }

-    const QString CGuiUtility::sizeAsString(const QSizeF &size)
+    QString CGuiUtility::sizeAsString(const QSizeF &size)
    {
        return QStringLiteral("w: %1 h: %2").arg(size.width()).arg(size.height());
    }
@@ -972,7 +972,7 @@ namespace BlackGui
        return openWidgets;
    }

-    QStringList CGuiUtility::getAllWidgetTitles(const QWidgetList widgets)
+    QStringList CGuiUtility::getAllWidgetTitles(const QWidgetList &widgets)
    {
        QStringList titles;
        for (const QWidget *w : widgets)
@@ -990,7 +990,7 @@ namespace BlackGui
        return titles;
    }

-    QStringList CGuiUtility::getAllWidgetNames(const QWidgetList widgets)
+    QStringList CGuiUtility::getAllWidgetNames(const QWidgetList &widgets)
    {
        QStringList titles;
        for (const QWidget *w : widgets)
--- a/src/blackgui/guiutility.h
+++ b/src/blackgui/guiutility.h
@@ -87,10 +87,10 @@ namespace BlackGui

        //! QRect, QSize as string
        //! @{
-        static const QString rectAsString(const QRect &rect);
-        static const QString rectAsString(const QRectF &rect);
-        static const QString sizeAsString(const QSize &size);
-        static const QString sizeAsString(const QSizeF &size);
+        static QString rectAsString(const QRect &rect);
+        static QString rectAsString(const QRectF &rect);
+        static QString sizeAsString(const QSize &size);
+        static QString sizeAsString(const QSizeF &size);
        //! @}

        //! Top level widgets with names
@@ -292,10 +292,10 @@ namespace BlackGui
        static QWidgetList getAllModallWidgets();

        //! All titles
-        static QStringList getAllWidgetTitles(const QWidgetList widgets);
+        static QStringList getAllWidgetTitles(const QWidgetList &widgets);

        //! All names
-        static QStringList getAllWidgetNames(const QWidgetList widgets);
+        static QStringList getAllWidgetNames(const QWidgetList &widgets);

        //! Get all dock widgets
        static QList<QDockWidget *> getAllDockWidgets(QWidget *parent, bool floatingOnly);
--- a/src/blackgui/menus/menuaction.cpp
+++ b/src/blackgui/menus/menuaction.cpp
@@ -377,7 +377,7 @@ namespace BlackGui
                QMenu *currentMenu = nullptr;

                // reverse iteration because same key values are inserted and have reverse order
-                for (const CMenuAction &menuAction : actions)
+                for (const CMenuAction &menuAction : std::as_const(actions))
                {
                    // create submenu if required
                    if (!currentMenu)
--- a/src/blackgui/models/columns.cpp
+++ b/src/blackgui/models/columns.cpp
@@ -220,7 +220,7 @@ namespace BlackGui
            return false;
        }

-        void CColumns::setWidthPercentages(const QList<int> percentages)
+        void CColumns::setWidthPercentages(const QList<int> &percentages)
        {
            if (percentages.isEmpty())
            {
--- a/src/blackgui/models/columns.h
+++ b/src/blackgui/models/columns.h
@@ -232,7 +232,7 @@ namespace BlackGui
            bool hasAnyWidthPercentage() const;

            //! Set the width percentages
-            void setWidthPercentages(const QList<int> percentages);
+            void setWidthPercentages(const QList<int> &percentages);

            //! Calculate the absolute width
            QList<int> calculateWidths(int totalWidth) const;
--- a/src/blackgui/shortcut.cpp
+++ b/src/blackgui/shortcut.cpp
@@ -100,7 +100,7 @@ namespace BlackGui
        return k;
    }

-    const QString CShortcut::toParenthesisString(const QKeySequence &sequence)
+    QString CShortcut::toParenthesisString(const QKeySequence &sequence)
    {
        return QStringLiteral("(%1)").arg(sequence.toString());
    }
--- a/src/blackgui/shortcut.h
+++ b/src/blackgui/shortcut.h
@@ -71,7 +71,7 @@ namespace BlackGui
        static const QKeySequence &keyFontReset();

        //! As string for menus etc. Looks like "(CTRL + R)"
-        static const QString toParenthesisString(const QKeySequence &sequence);
+        static QString toParenthesisString(const QKeySequence &sequence);
    };
 } // ns
 #endif // guard
--- a/src/blackgui/views/applicationinfoview.cpp
+++ b/src/blackgui/views/applicationinfoview.cpp
@@ -29,7 +29,7 @@ namespace BlackGui
        int CApplicationInfoView::otherSwiftVersionsFromDataDirectories(bool reinitOtherVersions)
        {
            const CApplicationInfoList others = CApplicationInfoList::fromOtherSwiftVersionsFromDataDirectories(reinitOtherVersions);
-            m_acceptRowSelection = (others.size() > 0);
+            m_acceptRowSelection = (!others.isEmpty());

            this->updateContainer(others);
            return others.size();