From 0fa9bcb520f0628ed9955494b656074c4a935ea7 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 27 Oct 2019 00:19:52 +0200 Subject: [PATCH] Doxygen, style --- src/blackcore/afv/clients/afvclient.cpp | 1 - src/blackcore/context/contextnetwork.cpp | 1 + src/blackcore/fsd/fsdclient.h | 3 ++- src/blackcore/fsd/pong.h | 2 +- src/blackcore/fsd/serializer.h | 4 ++-- src/swiftguistandard/main.cpp | 2 +- src/swiftguistandard/swiftguistdapplication.cpp | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/blackcore/afv/clients/afvclient.cpp b/src/blackcore/afv/clients/afvclient.cpp index 1e3771f19..d390c156e 100644 --- a/src/blackcore/afv/clients/afvclient.cpp +++ b/src/blackcore/afv/clients/afvclient.cpp @@ -1049,7 +1049,6 @@ namespace BlackCore const CAtcStationList matchingAtcStations = sApp->getIContextNetwork()->getOnlineStationsForFrequency(f, spacing); const CAtcStation closest = matchingAtcStations.findClosest(1, sApp->getIContextOwnAircraft()->getOwnAircraftSituation().getPosition()).frontOrDefault(); - if (fuzzyMatchCallSign(it->name, closest.getCallsign().asString())) { // this is how it should be diff --git a/src/blackcore/context/contextnetwork.cpp b/src/blackcore/context/contextnetwork.cpp index a5f76b0f3..20dced714 100644 --- a/src/blackcore/context/contextnetwork.cpp +++ b/src/blackcore/context/contextnetwork.cpp @@ -56,6 +56,7 @@ namespace BlackCore // split parser values if (IContextNetwork::getCmdLineOptions().isEmpty()) { return false; } // no such option, avoid warnings + if (!sApp) { return false; } const QString clientIdAndKey = sApp->getParserValue("clientIdAndKey").toLower(); if (clientIdAndKey.isEmpty() || !clientIdAndKey.contains(':')) { return false; } const QStringList stringList = clientIdAndKey.split(':'); diff --git a/src/blackcore/fsd/fsdclient.h b/src/blackcore/fsd/fsdclient.h index a4744dca5..58bcde0fa 100644 --- a/src/blackcore/fsd/fsdclient.h +++ b/src/blackcore/fsd/fsdclient.h @@ -235,8 +235,9 @@ namespace BlackCore void killRequestReceived(const QString &reason); private: - //! \private + //! \cond friend BlackFsdTest::CTestFSDClient; + //! \endcond //! Send FSD message template diff --git a/src/blackcore/fsd/pong.h b/src/blackcore/fsd/pong.h index 23dac3a54..7323564a1 100644 --- a/src/blackcore/fsd/pong.h +++ b/src/blackcore/fsd/pong.h @@ -33,7 +33,7 @@ namespace BlackCore //! PDU identifier static QString pdu() { return "$PO"; } - QString m_timestamp; + QString m_timestamp; //!< timestamp private: Pong(); diff --git a/src/blackcore/fsd/serializer.h b/src/blackcore/fsd/serializer.h index 421914b9f..d2011b116 100644 --- a/src/blackcore/fsd/serializer.h +++ b/src/blackcore/fsd/serializer.h @@ -22,7 +22,7 @@ namespace BlackCore { namespace Fsd { - //! From/to string serialization @{ + //! \cond template inline QString toQString(const T& value); @@ -79,7 +79,7 @@ namespace BlackCore template<> AtisLineType fromQString(const QString &str); - //! @} + //! \endcond } } diff --git a/src/swiftguistandard/main.cpp b/src/swiftguistandard/main.cpp index fdf47f452..8bcf6d39c 100644 --- a/src/swiftguistandard/main.cpp +++ b/src/swiftguistandard/main.cpp @@ -26,7 +26,7 @@ int main(int argc, char *argv[]) //! [SwiftApplicationDemo] CGuiApplication::highDpiScreenSupport(CGuiApplication::parseScaleFactor(argc, argv)); QApplication qa(argc, argv); - Q_UNUSED(qa); // application init needed + Q_UNUSED(qa) // application init needed CCrashHandler::instance()->init(); CSwiftGuiStdApplication a; // application with contexts diff --git a/src/swiftguistandard/swiftguistdapplication.cpp b/src/swiftguistandard/swiftguistdapplication.cpp index a195738d5..34b181ef0 100644 --- a/src/swiftguistandard/swiftguistdapplication.cpp +++ b/src/swiftguistandard/swiftguistdapplication.cpp @@ -88,7 +88,7 @@ bool CSwiftGuiStdApplication::parsingHookIn() const QString dBusAddress(this->getCmdDBusAddressValue()); if (!dBusAddress.isEmpty()) { - // check if rechable + // check if reachable if (!CDBusServer::isDBusAvailable(dBusAddress)) { this->cmdLineErrorMessage("DBus server at '" + dBusAddress + "' can not be reached");