flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #626 Update CVariant warnings to current style.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-04-02 16:29:45 +01:00
parent 79121e0088
commit d36f003817
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/blackmisc/variant.cpp
View File

@@ -76,13 +76,14 @@ namespace BlackMisc
}
else
{
qWarning() << "Comparing two CVariants containing unrelated value objects";
CLogMessage(&a).warning("Comparing two CVariants containing unrelated value objects: %1 (%2) and %3 (%4)")
<< a.typeName() << a.userType() << b.typeName() << b.userType();
return 0;
}
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(&a).debug() << ex.what();
return 0;
}
}
@@ -125,12 +126,12 @@ namespace BlackMisc
}
else
{
qWarning() << "Unsupported CVariant type for toJson:" << m_v.typeName() << "(" << m_v.userType() << ")";
CLogMessage(this).warning("Unsupported CVariant type for toJson: %1 (%2)") << typeName() << userType();
}
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
}
}
return json;
@@ -172,17 +173,17 @@ namespace BlackMisc
m_v.setValue(json.value("value").toString());
if (! m_v.convert(typeId))
{
qWarning() << "Failed to convert from JSON string";
CLogMessage(this).warning("Failed to convert from JSON string");
}
}
else
{
qWarning() << "Unsupported CVariant type for fromJson";
CLogMessage(this).warning("Unsupported CVariant type for fromJson: %1 (%2)") << typeName << typeId;
}
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
}
}
}
@@ -215,13 +216,13 @@ namespace BlackMisc
}
else
{
qWarning() << "Unsupported CVariant type for getValueHash";
CLogMessage(this).warning("Unsupported CVariant type for getValueHash: %1 (%2)") << typeName() << userType();
return 0;
}
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
return 0;
}
}
@@ -274,7 +275,7 @@ namespace BlackMisc
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
}
}
@@ -290,7 +291,7 @@ namespace BlackMisc
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
return {};
}
}
@@ -305,7 +306,7 @@ namespace BlackMisc
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
return {};
}
}
@@ -320,7 +321,7 @@ namespace BlackMisc
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
return false;
}
}
@@ -337,7 +338,7 @@ namespace BlackMisc
}
catch (const Private::CVariantException &ex)
{
CLogMessage().debug() << ex.what();
CLogMessage(this).debug() << ex.what();
return {};
}
}
@@ -360,7 +361,7 @@ namespace BlackMisc
// complex, user type
// it has to be made sure, that the cast works
const QDBusArgument arg = variant.value<QDBusArgument>();
const int userType = static_cast<int>(QVariant::UserType);
constexpr int userType = static_cast<int>(QVariant::UserType);
if (localUserType < userType)
{
// complex Qt type, e.g. QDateTime