Rename 'ResourceId' structured data type to just 'Resource'

This commit is contained in:
baldurk committed 2018-02-24 23:22:24 +00:00
1 parent 4ee9443f52
commit 3fe8ad4e3f
6 files changed
+13 -13

No files matched your search

+4 -4
View File
@@ -82,7 +82,7 @@ DOCUMENT(R"(The basic irreducible type of an object. Every other more complex ty
A single byte character. Wide/multi-byte characters are not supported (these would be stored as a
string with 1 character and multiple bytes in UTF-8).
.. data:: ResourceId
.. data:: Resource
A ResourceId. Equivalent to (and stored as) an 8-byte unsigned integer, but specifically contains
the unique Id of a resource in a capture.
@@ -101,7 +101,7 @@ enum class SDBasic : uint32_t
Float,
Boolean,
Character,
ResourceId,
Resource,
};
DECLARE_REFLECTION_ENUM(SDBasic);
@@ -395,7 +395,7 @@ struct SDObject
case SDBasic::Enum:
case SDBasic::UnsignedInteger: return QVariant(qulonglong(data.basic.u));
case SDBasic::SignedInteger: return QVariant(qlonglong(data.basic.i));
case SDBasic::ResourceId: return (QVariant)data.basic.id;
case SDBasic::Resource: return (QVariant)data.basic.id;
case SDBasic::Float: return data.basic.d;
case SDBasic::Boolean: return data.basic.b;
case SDBasic::Character: return data.basic.c;
@@ -545,7 +545,7 @@ DOCUMENT("Make a structured object out of a ResourceId");
inline SDObject *makeSDObject(const char *name, ResourceId val)
{
SDObject *ret = new SDObject(name, "ResourceId");
ret->type.basetype = SDBasic::ResourceId;
ret->type.basetype = SDBasic::Resource;
ret->type.byteSize = 8;
ret->data.basic.id = val;
return ret;