fix Warning
This commit is contained in:
1 parent
593c221d23
commit
8345470273
316 files changed
+1246
-929
No files matched your search
+2
-2
@@ -935,8 +935,8 @@ void LtsUtilsTest::test_jsonArray()
|
||||
|
||||
QVERIFY_EXCEPTION_THROWN(array.at<std::string>(0), JsonTypeError);
|
||||
|
||||
QVERIFY_EXCEPTION_THROWN(array.contains<int>(-1), JsonRangeError);
|
||||
QVERIFY_EXCEPTION_THROWN(array.contains<int>(4), JsonRangeError);
|
||||
QVERIFY_EXCEPTION_THROWN((void)array.contains<int>(-1), JsonRangeError);
|
||||
QVERIFY_EXCEPTION_THROWN((void)array.contains<int>(4), JsonRangeError);
|
||||
QVERIFY_EXCEPTION_THROWN(array.at<int>(-1), JsonRangeError);
|
||||
QVERIFY_EXCEPTION_THROWN(array.at<int>(4), JsonRangeError);
|
||||
|
||||
|
||||
+2
-4
@@ -223,12 +223,10 @@ template <typename T> bool inline get1Byte(const QByteArray& baData, size_t& pos
|
||||
if (size_t(baData.size()) < pos + 1)
|
||||
return false;
|
||||
|
||||
const char* data = baData.data() + pos;
|
||||
|
||||
if (std::numeric_limits<T>::is_signed)
|
||||
out = (T)(data[0]);
|
||||
out = (T)(baData.at(pos));
|
||||
else
|
||||
out = (T)(data[0] & 0xFF);
|
||||
out = (T)(baData.at(pos) & 0xFF);
|
||||
|
||||
pos += 1;
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace LtsUtils
|
||||
|
||||
inline bool lessThan(const QVariant& var1, const QVariant& var2)
|
||||
{
|
||||
if (var1.canConvert(QMetaType::QString) && var2.canConvert(QMetaType::QString))
|
||||
if (var1.canConvert<QString>() && var2.canConvert<QString>())
|
||||
{
|
||||
QString str1(var1.toString());
|
||||
QString str2(var2.toString());
|
||||
@@ -28,7 +28,7 @@ inline bool lessThan(const QVariant& var1, const QVariant& var2)
|
||||
|
||||
return d1 < d2;
|
||||
}
|
||||
else if (var1.canConvert(QMetaType::Double) && var2.canConvert(QMetaType::Double))
|
||||
else if (var1.canConvert<double>() && var2.canConvert<double>())
|
||||
return var1.toDouble() < var2.toDouble();
|
||||
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user