Convert ToStr, Serialise, and TypeName to use literal strings

This commit is contained in:
baldurk
2019-05-15 14:12:17 +01:00
parent c8a518f05c
commit 699f8753af
84 changed files with 1215 additions and 1186 deletions
@@ -590,9 +590,8 @@ bool PythonContext::LoadExtension(ICaptureContext &ctx, const rdcstr &extension)
if(register_func)
{
QByteArray baseTypeName = TypeName<ICaptureContext>();
baseTypeName += " *";
PyObject *pyctx = PassObjectToPython(baseTypeName.data(), &ctx);
PyObject *pyctx =
PassObjectToPython((rdcstr(TypeName<ICaptureContext>()) + " *").c_str(), &ctx);
PyObject *retval = NULL;
if(pyctx)
+1 -3
View File
@@ -68,9 +68,7 @@ public:
template <typename T>
void setGlobal(const char *varName, T *object)
{
QByteArray baseTypeName = TypeName<T>();
baseTypeName += " *";
setGlobal(varName, baseTypeName.data(), (void *)object);
setGlobal(varName, (rdcstr(TypeName<T>()) + " *").c_str(), (void *)object);
}
template <typename QtObjectType>
+1 -1
View File
@@ -77,7 +77,7 @@ inline SDObject *MakeFromArgsTuple<SDObject>(PyObject *args)
SWIG_exception_fail(SWIG_ArgError(res),
"invalid type name used to create SDObject, expected string");
result = new SDObject(name.c_str(), typeName.c_str());
result = new SDObject(name.c_str(), typeName);
return result;
fail:
+3 -3
View File
@@ -39,7 +39,7 @@ struct TypeConversion
if(cached_type_info)
return cached_type_info;
std::string baseTypeName = TypeName<T>();
rdcstr baseTypeName = TypeName<T>();
baseTypeName += " *";
cached_type_info = SWIG_TypeQuery(baseTypeName.c_str());
@@ -103,7 +103,7 @@ struct TypeConversion<Opaque *, false>
if(cached_type_info)
return cached_type_info;
std::string baseTypeName = TypeName<Opaque>();
rdcstr baseTypeName = TypeName<Opaque>();
baseTypeName += " *";
cached_type_info = SWIG_TypeQuery(baseTypeName.c_str());
@@ -526,7 +526,7 @@ struct TypeConversion<rdcarray<U>, false>
static swig_type_info *GetTypeInfo()
{
static swig_type_info *cached_type_info = NULL;
static std::string typeName = std::string("rdcarray < ") + TypeName<U>() + " > *";
static rdcstr typeName = "rdcarray < " + TypeName<U>() + " > *";
if(cached_type_info)
return cached_type_info;
@@ -29,7 +29,7 @@
#include "renderdoc_replay.h"
template <>
std::string DoStringise(const uint32_t &el)
rdcstr DoStringise(const uint32_t &el)
{
static char tmp[16];
memset(tmp, 0, sizeof(tmp));