From c1ac229875353ae6e0b27692620dc1a0b4a2cc20 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 4 Apr 2018 20:12:48 +0200 Subject: [PATCH] Formatting --- src/blackcore/context/contextnetworkimpl.cpp | 74 +++++++------------- src/blackmisc/pq/angle.cpp | 4 +- src/xswiftbus/datarefs.h | 22 +++--- 3 files changed, 38 insertions(+), 62 deletions(-) diff --git a/src/blackcore/context/contextnetworkimpl.cpp b/src/blackcore/context/contextnetworkimpl.cpp index cfb81b16e..a45709f3d 100644 --- a/src/blackcore/context/contextnetworkimpl.cpp +++ b/src/blackcore/context/contextnetworkimpl.cpp @@ -161,61 +161,37 @@ namespace BlackCore { if (this->isDebugEnabled()) {CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; } QString msg; - if (!server.getUser().hasCredentials()) - { - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid user credentials"); - } - else if (!this->ownAircraft().getAircraftIcaoCode().hasDesignator()) - { - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid ICAO data for own aircraft"); - } - else if (!CNetworkUtils::canConnect(server, msg, 5000)) - { - return CStatusMessage(CStatusMessage::SeverityError, msg); - } - else if (m_network->isConnected()) - { - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Already connected"); - } - else if (this->isPendingConnection()) - { - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Pending connection, please wait"); - } - else - { - m_currentStatus = INetwork::Connecting; // as semaphore we are going to connect - this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser()); - const CSimulatedAircraft ownAircraft(this->ownAircraft()); - m_network->presetServer(server); + if (!server.getUser().hasCredentials()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid user credentials"); } + if (!this->ownAircraft().getAircraftIcaoCode().hasDesignator()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Invalid ICAO data for own aircraft"); } + if (!CNetworkUtils::canConnect(server, msg, 5000)) { return CStatusMessage(CStatusMessage::SeverityError, msg); } + if (m_network->isConnected()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Already connected"); } + if (this->isPendingConnection()) { return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityError, "Pending connection, please wait"); } - // Fall back to observer mode, if no simulator is available or not simulating - if (!CBuildConfig::isLocalDeveloperDebugBuild() && !this->getIContextSimulator()->isSimulatorSimulating()) - { - CLogMessage(this).info("No simulator connected or connected simulator not simulating. Falling back to observer mode"); - mode = INetwork::LoginAsObserver; - } + m_currentStatus = INetwork::Connecting; // as semaphore we are going to connect + this->getIContextOwnAircraft()->updateOwnAircraftPilot(server.getUser()); + const CSimulatedAircraft ownAircraft(this->ownAircraft()); + m_network->presetServer(server); - m_network->presetLoginMode(mode); - m_network->presetCallsign(ownAircraft.getCallsign()); - m_network->presetIcaoCodes(ownAircraft); - if (getIContextSimulator()) - { - m_network->presetSimulatorInfo(getIContextSimulator()->getSimulatorPluginInfo()); - } - else - { - m_network->presetSimulatorInfo(CSimulatorPluginInfo()); - } - m_network->initiateConnection(); - return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, "Connection pending " + server.getAddress() + " " + QString::number(server.getPort())); + // Fall back to observer mode, if no simulator is available or not simulating + if (!CBuildConfig::isLocalDeveloperDebugBuild() && !this->getIContextSimulator()->isSimulatorSimulating()) + { + CLogMessage(this).info("No simulator connected or connected simulator not simulating. Falling back to observer mode"); + mode = INetwork::LoginAsObserver; } + + m_network->presetLoginMode(mode); + m_network->presetCallsign(ownAircraft.getCallsign()); + m_network->presetIcaoCodes(ownAircraft); + + const CSimulatorPluginInfo sim = this->getIContextSimulator() ? this->getIContextSimulator()->getSimulatorPluginInfo() : CSimulatorPluginInfo(); + m_network->presetSimulatorInfo(sim); + m_network->initiateConnection(); + return CStatusMessage({ CLogCategory::validation() }, CStatusMessage::SeverityInfo, "Connection pending " + server.getAddress() + " " + QString::number(server.getPort())); } CServer CContextNetwork::getConnectedServer() const { - return this->isConnected() ? - m_network->getPresetServer() : - CServer(); + return this->isConnected() ? m_network->getPresetServer() : CServer(); } CStatusMessage CContextNetwork::disconnectFromNetwork() @@ -300,7 +276,7 @@ namespace BlackCore else { bool isNumber; - double frequencyMhz = receiver.toDouble(&isNumber); + const double frequencyMhz = receiver.toDouble(&isNumber); if (isNumber) { CFrequency radioFrequency = CFrequency(frequencyMhz, CFrequencyUnit::MHz()); diff --git a/src/blackmisc/pq/angle.cpp b/src/blackmisc/pq/angle.cpp index 6c543620f..0cf8dd066 100644 --- a/src/blackmisc/pq/angle.cpp +++ b/src/blackmisc/pq/angle.cpp @@ -86,12 +86,12 @@ namespace BlackMisc double CAngle::piFactor() const { - return Math::CMathUtils::round(this->value(CAngleUnit::rad()) / Math::CMathUtils::PI(), 6); + return Math::CMathUtils::round(this->value(CAngleUnit::rad()) / CMathUtils::PI(), 6); } const double &CAngle::PI() { - return Math::CMathUtils::PI(); + return CMathUtils::PI(); } double CAngle::sin() const diff --git a/src/xswiftbus/datarefs.h b/src/xswiftbus/datarefs.h index 5b93428c1..70c8fb7bd 100644 --- a/src/xswiftbus/datarefs.h +++ b/src/xswiftbus/datarefs.h @@ -27,7 +27,7 @@ namespace XSwiftBus class DataRefImpl { public: - DataRefImpl(char const* name) : m_ref(XPLMFindDataRef(name)) + DataRefImpl(char const *name) : m_ref(XPLMFindDataRef(name)) { if (! m_ref) { @@ -50,7 +50,7 @@ namespace XSwiftBus class ArrayDataRefImpl { public: - ArrayDataRefImpl(char const* name, int size) : m_ref(XPLMFindDataRef(name)), m_size(size) + ArrayDataRefImpl(char const *name, int size) : m_ref(XPLMFindDataRef(name)), m_size(size) { if (! m_ref) { @@ -60,7 +60,7 @@ namespace XSwiftBus } template - void implSetAll(std::vector const&); + void implSetAll(std::vector const &); template std::vector implGetAll() const; @@ -126,7 +126,7 @@ namespace XSwiftBus using DataRefType = typename DataRefTraits::type; //! Set the value of the whole array (if it is writable) - void setAll(std::vector const& a) { ArrayDataRefImpl::implSetAll(a); } + void setAll(std::vector const &a) { ArrayDataRefImpl::implSetAll(a); } //! Get the value of the whole array std::vector getAll() const { return ArrayDataRefImpl::implGetAll(); } @@ -158,18 +158,18 @@ namespace XSwiftBus } //! Set the value of the whole string (if it is writable) - void set(std::string const& s) { setSubstr(0, s); } + void set(std::string const &s) { setSubstr(0, s); } //! Get the value of the whole string std::string get() const { return getSubstr(0, DataRefTraits::size); } //! Set the value of part of the string (if it is writable) - void setSubstr(size_t offset, std::string const& s) + void setSubstr(size_t offset, std::string const &s) { assert((s.size() + 1) <= (DataRefTraits::size - offset)); XPLMSetDatab(m_ref, s.c_str(), offset, s.size() + 1); } //! Get the value of part of the string std::string getSubstr(size_t offset, size_t size) const - { std::string s (size, 0); XPLMGetDatab(m_ref, &s[0], (int)offset, (int)size); size = s.find(char(0)); if (size != std::string::npos) s.resize(size); return s; } + { std::string s(size, 0); XPLMGetDatab(m_ref, &s[0], (int)offset, (int)size); size = s.find(char(0)); if (size != std::string::npos) s.resize(size); return s; } private: XPLMDataRef m_ref; @@ -189,13 +189,13 @@ namespace XSwiftBus inline double DataRefImpl::implGet() const { return XPLMGetDatad(m_ref); } template <> - inline void ArrayDataRefImpl::implSetAll(std::vector const& v) { assert((int)v.size() <= m_size); XPLMSetDatavi(m_ref, const_cast(&v[0]), 0, (int)v.size()); } + inline void ArrayDataRefImpl::implSetAll(std::vector const &v) { assert((int)v.size() <= m_size); XPLMSetDatavi(m_ref, const_cast(&v[0]), 0, (int)v.size()); } template <> - inline void ArrayDataRefImpl::implSetAll(std::vector const& v) { assert((int)v.size() <= m_size); XPLMSetDatavf(m_ref, const_cast(&v[0]), 0, (int)v.size()); } + inline void ArrayDataRefImpl::implSetAll(std::vector const &v) { assert((int)v.size() <= m_size); XPLMSetDatavf(m_ref, const_cast(&v[0]), 0, (int)v.size()); } template <> - inline std::vector ArrayDataRefImpl::implGetAll() const { std::vector v (m_size); XPLMGetDatavi(m_ref, &v[0], 0, m_size); return v; } + inline std::vector ArrayDataRefImpl::implGetAll() const { std::vector v(m_size); XPLMGetDatavi(m_ref, &v[0], 0, m_size); return v; } template <> - inline std::vector ArrayDataRefImpl::implGetAll() const { std::vector v (m_size); XPLMGetDatavf(m_ref, &v[0], 0, m_size); return v; } + inline std::vector ArrayDataRefImpl::implGetAll() const { std::vector v(m_size); XPLMGetDatavf(m_ref, &v[0], 0, m_size); return v; } template <> inline void ArrayDataRefImpl::implSetAt(int i, int d) { assert(i <= m_size); XPLMSetDatavi(m_ref, &d, i, 1); }