From dff8db131f6f845c233b34c0dd4739e41377a76e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 14 Nov 2016 21:29:18 +0100 Subject: [PATCH] refs #780, "qUtf8Printable" fixes https://dev.vatsim-germany.org/issues/780#note-9 number 2 --- src/blackmisc/aviation/aircraftsituation.cpp | 3 ++- src/blackmisc/geo/coordinategeodetic.cpp | 11 +++++------ src/blackmisc/orderable.cpp | 5 +++-- src/blackmisc/timestampbased.cpp | 7 ++++--- tests/blackcore/testreaders.cpp | 6 +++--- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index 63e0a02c2..853de7839 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -12,6 +12,7 @@ #include "blackmisc/pq/units.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" +#include "blackmisc/verify.h" #include @@ -156,7 +157,7 @@ namespace BlackMisc break; } const QString assertMsg("No comparison for index " + index.toQString()); - Q_ASSERT_X(false, Q_FUNC_INFO, assertMsg.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(assertMsg)); return 0; } diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index 17a52cc85..01beec821 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -10,13 +10,12 @@ #include "blackmisc/geo/coordinategeodetic.h" #include "blackmisc/propertyindex.h" #include "blackmisc/variant.h" +#include "blackmisc/verify.h" #include #include #include - - using namespace BlackMisc::PhysicalQuantities; using namespace BlackMisc::Math; @@ -111,7 +110,7 @@ namespace BlackMisc } const QString m = QString("no property, index ").append(index.toQString()); - Q_ASSERT_X(false, Q_FUNC_INFO, m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant::fromValue(m); } @@ -140,7 +139,7 @@ namespace BlackMisc } const QString m = QString("no property, index ").append(index.toQString()); - Q_ASSERT_X(false, Q_FUNC_INFO, m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return 0; } @@ -281,7 +280,7 @@ namespace BlackMisc } } const QString m = QString("no property, index ").append(index.toQString()); - Q_ASSERT_X(false, "ICoordinateWithRelativePosition", m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant::fromValue(m); } @@ -301,7 +300,7 @@ namespace BlackMisc break; default: const QString m = QString("no property, index ").append(index.toQString()); - Q_ASSERT_X(false, "ICoordinateWithRelativePosition", m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); break; } } diff --git a/src/blackmisc/orderable.cpp b/src/blackmisc/orderable.cpp index 2e4273c80..07ac00e34 100644 --- a/src/blackmisc/orderable.cpp +++ b/src/blackmisc/orderable.cpp @@ -10,6 +10,7 @@ #include "blackmisc/comparefunctions.h" #include "blackmisc/orderable.h" #include "blackmisc/variant.h" +#include "blackmisc/verify.h" #include #include @@ -56,7 +57,7 @@ namespace BlackMisc } } const QString m = QString("Cannot handle index %1").arg(index.toQString()); - Q_ASSERT_X(false, Q_FUNC_INFO, m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant::fromValue(m); } @@ -76,7 +77,7 @@ namespace BlackMisc } } const QString m = QString("Cannot handle index %1").arg(index.toQString()); - Q_ASSERT_X(false, Q_FUNC_INFO, m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); } int IOrderable::comparePropertyByIndex(const CPropertyIndex &index, const IOrderable &compareValue) const diff --git a/src/blackmisc/timestampbased.cpp b/src/blackmisc/timestampbased.cpp index 81903d9c3..951b7d230 100644 --- a/src/blackmisc/timestampbased.cpp +++ b/src/blackmisc/timestampbased.cpp @@ -10,6 +10,7 @@ #include "blackmisc/comparefunctions.h" #include "blackmisc/timestampbased.h" #include "blackmisc/variant.h" +#include "blackmisc/verify.h" #include #include @@ -197,7 +198,7 @@ namespace BlackMisc } } const QString m = QString("Cannot handle index %1").arg(index.toQString()); - Q_ASSERT_X(false, Q_FUNC_INFO, m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); return CVariant::fromValue(m); } @@ -220,7 +221,7 @@ namespace BlackMisc case IndexUtcTimestampFormattedHms: case IndexUtcTimestampFormattedDhms: { - QDateTime dt = QDateTime::fromString(variant.toQString()); + const QDateTime dt = QDateTime::fromString(variant.toQString()); this->m_timestampMSecsSinceEpoch = dt.toMSecsSinceEpoch(); } default: @@ -228,7 +229,7 @@ namespace BlackMisc } } const QString m = QString("Cannot handle index %1").arg(index.toQString()); - Q_ASSERT_X(false, Q_FUNC_INFO, m.toLocal8Bit().constData()); + BLACK_VERIFY_X(false, Q_FUNC_INFO, qUtf8Printable(m)); } int ITimestampBased::comparePropertyByIndex(const CPropertyIndex &index, const ITimestampBased &compareValue) const diff --git a/tests/blackcore/testreaders.cpp b/tests/blackcore/testreaders.cpp index 16cd0f2b8..3e482279f 100644 --- a/tests/blackcore/testreaders.cpp +++ b/tests/blackcore/testreaders.cpp @@ -79,8 +79,8 @@ namespace BlackCoreTest const QString m1("No aircraft ICAOs " + url.getFullUrl()); const QString m2("No airline ICAOs " + url.getFullUrl()); - QVERIFY2(this->m_icaoReader->getAircraftIcaoCodesCount() > 0, m1.toLocal8Bit().constData()); - QVERIFY2(this->m_icaoReader->getAirlineIcaoCodesCount() > 0, m2.toLocal8Bit().constData()); + QVERIFY2(this->m_icaoReader->getAircraftIcaoCodesCount() > 0, qUtf8Printable(m1)); + QVERIFY2(this->m_icaoReader->getAirlineIcaoCodesCount() > 0, qUtf8Printable(m2)); const CAircraftIcaoCode aircraftIcao(this->m_icaoReader->getAircraftIcaoCodes().frontOrDefault()); const CAirlineIcaoCode airlineIcao(this->m_icaoReader->getAirlineIcaoCodes().frontOrDefault()); @@ -109,7 +109,7 @@ namespace BlackCoreTest } const QString m1("No models " + url.getFullUrl()); - QVERIFY2(this->m_modelReader->getModelsCount() > 0, m1.toLocal8Bit().constData()); + QVERIFY2(this->m_modelReader->getModelsCount() > 0, qUtf8Printable(m1)); const CAircraftModel model(m_modelReader->getModels().frontOrDefault()); QVERIFY2(model.getLivery().hasCompleteData(), "Missing data for livery");