Resolves latest issues in Lts/Common Lts/DDS
This commit is contained in:
25 files changed
+537
-47
No files matched your search
@@ -856,10 +856,12 @@ bool StructBuilder::fixupQVariantConversions(MemberInformation& mi) const
|
||||
svcName += QStringLiteral("::");
|
||||
mi.cpp.type = svcName + mi.enumeration->enumName;
|
||||
mi.cpp.fromVariantPre2 =
|
||||
QStringLiteral("static_cast<") + svcName + mi.enumeration->enumName + QStringLiteral("_def::type>(");
|
||||
QStringLiteral("static_cast<") + svcName + mi.enumeration->enumName + QStringLiteral(">(");
|
||||
mi.cpp.fromVariantPost = QStringLiteral(".toInt())");
|
||||
mi.cpp.toVariantPre = QStringLiteral("static_cast<int>(");
|
||||
mi.cpp.toVariantPost = QStringLiteral(".underlying())");
|
||||
mi.cpp.toVariantPost.clear();
|
||||
mi.cpp.toJsonPre = QStringLiteral("toJson(static_cast<int>(");
|
||||
mi.cpp.toJsonPost = QStringLiteral("))");
|
||||
if (!mi.enumeration->values.isEmpty())
|
||||
{
|
||||
mi.cpp.defaultValue =
|
||||
@@ -874,6 +876,8 @@ bool StructBuilder::fixupQVariantConversions(MemberInformation& mi) const
|
||||
mi.cpp.type = QStringLiteral("qint64");
|
||||
mi.cpp.fromVariantPost = QStringLiteral(".toLongLong()");
|
||||
mi.cpp.fromJsonPost = QStringLiteral(".toDouble()");
|
||||
mi.cpp.toJsonPre = QStringLiteral("static_cast<qint64>(");
|
||||
mi.cpp.toJsonPost = QStringLiteral(")");
|
||||
mi.cpp.defaultValue = QLatin1Char('0');
|
||||
}
|
||||
else if (datatype == QLatin1String("boolean") || datatype == QLatin1String("bool"))
|
||||
|
||||
Reference in new issue
Block a user