From 5791de6860e1f50dfa25b66d144b16e8f2e7c2f6 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Thu, 10 Nov 2016 00:36:25 +0000 Subject: [PATCH] refs #800 Fixed some implicit conversion warnings. --- samples/blackmisc/sampleschangeobject.cpp | 4 +-- samples/blackmisc/samplescontainer.cpp | 4 +-- samples/blackmisc/samplesjson.cpp | 2 +- samples/blackmiscdbus/servicetool.cpp | 2 +- .../blackmiscquantities/samplesaviation.cpp | 4 +-- src/blackcore/airspaceanalyzer.cpp | 2 +- .../components/settingsguicomponent.cpp | 2 +- src/blackmisc/algorithm.h | 2 +- src/blackmisc/icon.cpp | 2 +- src/blackmisc/input/keyboardkey.cpp | 2 +- .../simulation/fscommon/bcdconversions.cpp | 6 ++-- src/blackmisc/stringutils.h | 2 +- src/blackmisc/testing.cpp | 2 +- src/blacksound/soundgenerator.cpp | 2 +- src/xbus/datarefs.h | 28 +++++++++---------- tests/blackmisc/testvariantandmap.cpp | 6 ++-- 16 files changed, 36 insertions(+), 36 deletions(-) diff --git a/samples/blackmisc/sampleschangeobject.cpp b/samples/blackmisc/sampleschangeobject.cpp index 7fa05d7af..9d923a88a 100644 --- a/samples/blackmisc/sampleschangeobject.cpp +++ b/samples/blackmisc/sampleschangeobject.cpp @@ -38,9 +38,9 @@ namespace BlackSample { // ATC station QDateTime dtFrom = QDateTime::currentDateTimeUtc(); - QDateTime dtUntil = dtFrom.addSecs(60 * 60.0); // 1 hour + QDateTime dtUntil = dtFrom.addSecs(60 * 60); // 1 hour QDateTime dtFrom2 = dtUntil; - QDateTime dtUntil2 = dtUntil.addSecs(60 * 60.0); + QDateTime dtUntil2 = dtUntil.addSecs(60 * 60); CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CLength(1487, CLengthUnit::ft())); CAtcStation station1(CCallsign("eddm_twr"), CUser("123456", "Joe Doe"), CFrequency(118.7, CFrequencyUnit::MHz()), diff --git a/samples/blackmisc/samplescontainer.cpp b/samples/blackmisc/samplescontainer.cpp index ca8495df8..4b163a8fa 100644 --- a/samples/blackmisc/samplescontainer.cpp +++ b/samples/blackmisc/samplescontainer.cpp @@ -42,9 +42,9 @@ namespace BlackSample { // ATC stations QDateTime dtFrom = QDateTime::currentDateTimeUtc(); - QDateTime dtUntil = dtFrom.addSecs(60 * 60.0); // 1 hour + QDateTime dtUntil = dtFrom.addSecs(60 * 60); // 1 hour QDateTime dtFrom2 = dtUntil; - QDateTime dtUntil2 = dtUntil.addSecs(60 * 60.0); + QDateTime dtUntil2 = dtUntil.addSecs(60 * 60); CFrequency freqEddmTwr(118.7, CFrequencyUnit::MHz()); CCallsign callsignEddmTwr("eddm_twr"); CCoordinateGeodetic geoPos = diff --git a/samples/blackmisc/samplesjson.cpp b/samples/blackmisc/samplesjson.cpp index 3806b2337..7100d30ff 100644 --- a/samples/blackmisc/samplesjson.cpp +++ b/samples/blackmisc/samplesjson.cpp @@ -62,7 +62,7 @@ namespace BlackSample qDebug() << json << l; qDebug() << "-------"; QDateTime dtFrom = QDateTime::currentDateTimeUtc(); - QDateTime dtUntil = dtFrom.addSecs(60 * 60.0); // 1 hour + QDateTime dtUntil = dtFrom.addSecs(60 * 60); // 1 hour CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CLength(1487, CLengthUnit::ft())); CAtcStation station(CCallsign("eddm_twr"), CUser("123456", "Joe Doe"), CFrequency(118.7, CFrequencyUnit::MHz()), geoPos, CLength(50, CLengthUnit::km()), false, dtFrom, dtUntil); diff --git a/samples/blackmiscdbus/servicetool.cpp b/samples/blackmiscdbus/servicetool.cpp index 8da108ec9..ebb9b5c5a 100644 --- a/samples/blackmiscdbus/servicetool.cpp +++ b/samples/blackmiscdbus/servicetool.cpp @@ -555,7 +555,7 @@ namespace BlackSample timer.restart(); CAircraftCfgEntriesList entriesList = testserviceInterface.getAircraftCfgEntriesList(5000); if (entriesList.size() != 5000) qDebug() << "wrong list size" << entriesList.size(); - int t5000 = timer.nsecsElapsed() / 1000000; // ms + qint64 t5000 = timer.nsecsElapsed() / 1000000; // ms qDebug() << "Reading aircraft cfg entries in ms:" << t5000; // object paths diff --git a/samples/blackmiscquantities/samplesaviation.cpp b/samples/blackmiscquantities/samplesaviation.cpp index cc06a5323..6ce169e2b 100644 --- a/samples/blackmiscquantities/samplesaviation.cpp +++ b/samples/blackmiscquantities/samplesaviation.cpp @@ -70,9 +70,9 @@ namespace BlackSample out << callsign1 << " " << callsign2 << " " << (callsign1 == callsign2) << endl; QDateTime dtFrom = QDateTime::currentDateTimeUtc(); - QDateTime dtUntil = dtFrom.addSecs(60 * 60.0); // 1 hour + QDateTime dtUntil = dtFrom.addSecs(60 * 60); // 1 hour QDateTime dtFrom2 = dtUntil; - QDateTime dtUntil2 = dtUntil.addSecs(60 * 60.0); + QDateTime dtUntil2 = dtUntil.addSecs(60 * 60); CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CLength(1487, CLengthUnit::ft())); CAtcStation station1(CCallsign("eddm_twr"), CUser("123456", "Joe Doe"), diff --git a/src/blackcore/airspaceanalyzer.cpp b/src/blackcore/airspaceanalyzer.cpp index 20d53425e..07987491d 100644 --- a/src/blackcore/airspaceanalyzer.cpp +++ b/src/blackcore/airspaceanalyzer.cpp @@ -155,7 +155,7 @@ namespace BlackCore qint64 currentTimeMsEpoch = QDateTime::currentMSecsSinceEpoch(); qint64 callDiffMs = currentTimeMsEpoch - m_lastWatchdogCallMsSinceEpoch; - qint64 callThresholdMs = m_timer.interval() * 1.5; + qint64 callThresholdMs = static_cast(m_timer.interval() * 1.5); m_lastWatchdogCallMsSinceEpoch = currentTimeMsEpoch; // this is a trick to not remove everything while debugging diff --git a/src/blackgui/components/settingsguicomponent.cpp b/src/blackgui/components/settingsguicomponent.cpp index cd11cfccf..54f087779 100644 --- a/src/blackgui/components/settingsguicomponent.cpp +++ b/src/blackgui/components/settingsguicomponent.cpp @@ -66,7 +66,7 @@ namespace BlackGui void CSettingsGuiComponent::setGuiOpacity(double value) { - ui->hs_SettingsGuiOpacity->setValue(value); + ui->hs_SettingsGuiOpacity->setValue(static_cast(value)); } void CSettingsGuiComponent::ps_fontChanged() diff --git a/src/blackmisc/algorithm.h b/src/blackmisc/algorithm.h index b1fee7faf..6f06939c5 100644 --- a/src/blackmisc/algorithm.h +++ b/src/blackmisc/algorithm.h @@ -40,7 +40,7 @@ namespace BlackMisc template void copyRandomElements(ForwardIt in, ForwardIt end, OutputIt out, int n, Generator &&rng) { - for (auto size = std::distance(in, end); in != end && n > 0; ++in, --size) + for (auto size = static_cast(std::distance(in, end)); in != end && n > 0; ++in, --size) { if (std::uniform_int_distribution<>(0, size - 1)(rng) < n) { diff --git a/src/blackmisc/icon.cpp b/src/blackmisc/icon.cpp index 01b551dc9..012f170d7 100644 --- a/src/blackmisc/icon.cpp +++ b/src/blackmisc/icon.cpp @@ -74,7 +74,7 @@ namespace BlackMisc void CIcon::setRotation(const PhysicalQuantities::CAngle &rotate) { - this->m_rotateDegrees = rotate.valueRounded(PhysicalQuantities::CAngleUnit::deg(), 0); + this->m_rotateDegrees = static_cast(rotate.valueRounded(PhysicalQuantities::CAngleUnit::deg(), 0)); } QString CIcon::convertToQString(bool i18n) const diff --git a/src/blackmisc/input/keyboardkey.cpp b/src/blackmisc/input/keyboardkey.cpp index 5d0cfa24d..f3b5f25c3 100644 --- a/src/blackmisc/input/keyboardkey.cpp +++ b/src/blackmisc/input/keyboardkey.cpp @@ -55,7 +55,7 @@ namespace BlackMisc if (isModifier()) { return keyStrings.value(m_keyCode); } - QChar key = QChar::fromLatin1(m_keyCode); + QChar key = QChar::fromLatin1(static_cast(m_keyCode)); return key; } diff --git a/src/blackmisc/simulation/fscommon/bcdconversions.cpp b/src/blackmisc/simulation/fscommon/bcdconversions.cpp index 59dc0c038..4620679ac 100644 --- a/src/blackmisc/simulation/fscommon/bcdconversions.cpp +++ b/src/blackmisc/simulation/fscommon/bcdconversions.cpp @@ -24,9 +24,9 @@ namespace BlackMisc quint32 CBcdConversions::comFrequencyToBcdHz(const BlackMisc::PhysicalQuantities::CFrequency &comFrequency) { // FSX documentation is wrong, we need to use kHz + 2 digits, not Hz - quint32 f = comFrequency.valueRounded(CFrequencyUnit::kHz(), 0) / 10; - f = dec2Bcd(f); - return f; + double f = comFrequency.valueRounded(CFrequencyUnit::kHz(), 0) / 10; + quint32 fInt = dec2Bcd(static_cast(f)); + return fInt; } quint32 CBcdConversions::transponderCodeToBcd(const BlackMisc::Aviation::CTransponder &transponder) diff --git a/src/blackmisc/stringutils.h b/src/blackmisc/stringutils.h index 3d4f7aaca..b8c609e24 100644 --- a/src/blackmisc/stringutils.h +++ b/src/blackmisc/stringutils.h @@ -52,7 +52,7 @@ namespace BlackMisc { auto it = std::find_if(s.begin(), s.end(), predicate); if (it == s.end()) { return -1; } - return std::distance(s.begin(), it); + return static_cast(std::distance(s.begin(), it)); } //! Split a string into multiple strings, using a predicate function to identify the split points. diff --git a/src/blackmisc/testing.cpp b/src/blackmisc/testing.cpp index e9ad3c3d6..0f534f4a3 100644 --- a/src/blackmisc/testing.cpp +++ b/src/blackmisc/testing.cpp @@ -56,7 +56,7 @@ namespace BlackMisc double f = 118.0 + (index % 30) * 0.25; const QDateTime dtFrom = QDateTime::currentDateTimeUtc(); - const QDateTime dtUntil = dtFrom.addSecs(60 * 60.0); // 1 hour + const QDateTime dtUntil = dtFrom.addSecs(60 * 60); // 1 hour const CUser user(id, usr); CAtcStation station; diff --git a/src/blacksound/soundgenerator.cpp b/src/blacksound/soundgenerator.cpp index 1b523996a..b7de851a5 100644 --- a/src/blacksound/soundgenerator.cpp +++ b/src/blacksound/soundgenerator.cpp @@ -285,7 +285,7 @@ namespace BlackSound if (!success) return false; CombinedHeader header; - qint64 headerLength = sizeof(CombinedHeader); + constexpr auto headerLength = sizeof(CombinedHeader); memset(&header, 0, headerLength); // RIFF header diff --git a/src/xbus/datarefs.h b/src/xbus/datarefs.h index 7fbdb0e20..9451db876 100644 --- a/src/xbus/datarefs.h +++ b/src/xbus/datarefs.h @@ -50,7 +50,7 @@ namespace XBus class ArrayDataRefImpl { public: - ArrayDataRefImpl(char const* name, size_t size) : m_ref(XPLMFindDataRef(name)), m_size(size) + ArrayDataRefImpl(char const* name, int size) : m_ref(XPLMFindDataRef(name)), m_size(size) { if (! m_ref) { @@ -66,14 +66,14 @@ namespace XBus std::vector implGetAll() const; template - void implSetAt(size_t index, T); + void implSetAt(int index, T); template - T implGetAt(size_t index) const; + T implGetAt(int index) const; private: XPLMDataRef m_ref; - size_t const m_size; + int const m_size; }; /*! @@ -126,10 +126,10 @@ namespace XBus std::vector getAll() const { return ArrayDataRefImpl::implGetAll(); } //! Set the value of a single element (if it is writable) - void setAt(size_t index, DataRefType d) { ArrayDataRefImpl::implSetAt(index, d); } + void setAt(int index, DataRefType d) { ArrayDataRefImpl::implSetAt(index, d); } //! Get the value of a single element - DataRefType getAt(size_t index) const { return ArrayDataRefImpl::implGetAt(index); } + DataRefType getAt(int index) const { return ArrayDataRefImpl::implGetAt(index); } }; /*! @@ -183,22 +183,22 @@ namespace XBus inline double DataRefImpl::implGet() const { return XPLMGetDatad(m_ref); } template <> - inline void ArrayDataRefImpl::implSetAll(std::vector const& v) { assert(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(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, (int)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, (int)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(size_t i, int d) { assert(i <= m_size); XPLMSetDatavi(m_ref, &d, (int)i, 1); } + inline void ArrayDataRefImpl::implSetAt(int i, int d) { assert(i <= m_size); XPLMSetDatavi(m_ref, &d, i, 1); } template <> - inline void ArrayDataRefImpl::implSetAt(size_t i, float d) { assert(i <= m_size); XPLMSetDatavf(m_ref, &d, (int)i, 1); } + inline void ArrayDataRefImpl::implSetAt(int i, float d) { assert(i <= m_size); XPLMSetDatavf(m_ref, &d, i, 1); } template <> - inline int ArrayDataRefImpl::implGetAt(size_t i) const { assert(i <= m_size); int d; XPLMGetDatavi(m_ref, &d, (int)i, 1); return d; } + inline int ArrayDataRefImpl::implGetAt(int i) const { assert(i <= m_size); int d; XPLMGetDatavi(m_ref, &d, i, 1); return d; } template <> - inline float ArrayDataRefImpl::implGetAt(size_t i) const { assert(i <= m_size); float d; XPLMGetDatavf(m_ref, &d, (int)i, 1); return d; } + inline float ArrayDataRefImpl::implGetAt(int i) const { assert(i <= m_size); float d; XPLMGetDatavf(m_ref, &d, i, 1); return d; } } // namespace diff --git a/tests/blackmisc/testvariantandmap.cpp b/tests/blackmisc/testvariantandmap.cpp index ab4433104..641783a03 100644 --- a/tests/blackmisc/testvariantandmap.cpp +++ b/tests/blackmisc/testvariantandmap.cpp @@ -45,9 +45,9 @@ namespace BlackMiscTest { // ATC station QDateTime dtFrom = QDateTime::currentDateTimeUtc(); - QDateTime dtUntil = dtFrom.addSecs(60 * 60.0); // 1 hour + QDateTime dtUntil = dtFrom.addSecs(60 * 60); // 1 hour QDateTime dtFrom2 = dtUntil; - QDateTime dtUntil2 = dtUntil.addSecs(60 * 60.0); + QDateTime dtUntil2 = dtUntil.addSecs(60 * 60); CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CLength(1487, CLengthUnit::ft())); CAtcStation station1(CCallsign("eddm_twr"), CUser("123456", "Joe Doe"), @@ -96,7 +96,7 @@ namespace BlackMiscTest { // ATC station QDateTime dtFrom = QDateTime::currentDateTimeUtc(); - QDateTime dtUntil = dtFrom.addSecs(60 * 60.0); // 1 hour + QDateTime dtUntil = dtFrom.addSecs(60 * 60); // 1 hour CCoordinateGeodetic geoPos = CCoordinateGeodetic::fromWgs84("48° 21′ 13″ N", "11° 47′ 09″ E", CLength(1487, CLengthUnit::ft())); CAtcStation station1(CCallsign("eddm_twr"), CUser("123456", "Joe Doe"),