flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #780, "qUtf8Printable" fixes

Browse Source 
https://dev.vatsim-germany.org/issues/780#note-9 number 2
This commit is contained in:
Klaus Basan
2016-11-14 21:29:18 +01:00
parent 04a5a74dc3
commit dff8db131f
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -12,6 +12,7 @@
#include "blackmisc/pq/units.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/variant.h"
#include "blackmisc/verify.h"
#include <QtGlobal>
@@ -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;
}

11
src/blackmisc/geo/coordinategeodetic.cpp
View File

@@ -10,13 +10,12 @@
#include "blackmisc/geo/coordinategeodetic.h"
#include "blackmisc/propertyindex.h"
#include "blackmisc/variant.h"
#include "blackmisc/verify.h"
#include <QByteArray>
#include <QtGlobal>
#include <cmath>
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;
}
}

5
src/blackmisc/orderable.cpp
View File

@@ -10,6 +10,7 @@
#include "blackmisc/comparefunctions.h"
#include "blackmisc/orderable.h"
#include "blackmisc/variant.h"
#include "blackmisc/verify.h"
#include <QByteArray>
#include <QtGlobal>
@@ -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

7
src/blackmisc/timestampbased.cpp
View File

@@ -10,6 +10,7 @@
#include "blackmisc/comparefunctions.h"
#include "blackmisc/timestampbased.h"
#include "blackmisc/variant.h"
#include "blackmisc/verify.h"
#include <QByteArray>
#include <QDate>
@@ -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

6
tests/blackcore/testreaders.cpp
View File

@@ -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");