lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make EnvironmentModification struct and pass around array directly

Browse Source 
* The old 'store in opaque void*' is kept as entry point wrappers only
  for the C# UI.
This commit is contained in:
baldurk
2017-04-07 12:36:14 +01:00
parent 43eb5072b4
commit bc79e2296f
17 changed files with 208 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Code/Interface/QRDInterface.cpp
+22 -45
View File
@@ -4,69 +4,46 @@
#include <QStandardPaths>
#include "Code/QRDUtils.h"
QString EnvironmentModification::GetTypeString() const
{
QString ret;
if(type == EnvMod::Append)
ret = QString("Append, %1").arg(ToQStr(separator));
else if(type == EnvMod::Prepend)
ret = QString("Prepend, %1").arg(ToQStr(separator));
else
ret = "Set";
return ret;
}
QString EnvironmentModification::GetDescription() const
{
QString ret;
if(type == EnvMod::Append)
ret = QString("Append %1 with %2 using %3").arg(variable).arg(value).arg(ToQStr(separator));
else if(type == EnvMod::Prepend)
ret = QString("Prepend %1 with %2 using %3").arg(variable).arg(value).arg(ToQStr(separator));
else
ret = QString("Set %1 to %2").arg(variable).arg(value);
return ret;
}
EnvironmentModification::operator QVariant() const
QVariant EnvModToVariant(const EnvironmentModification &env)
{
QVariantMap ret;
ret["variable"] = variable;
ret["value"] = value;
ret["type"] = ToQStr(type);
ret["separator"] = ToQStr(separator);
ret["variable"] = ToQStr(env.name);
ret["value"] = ToQStr(env.value);
ret["type"] = ToQStr(env.mod);
ret["separator"] = ToQStr(env.sep);
return ret;
}
EnvironmentModification::EnvironmentModification(const QVariant &v)
EnvironmentModification EnvModFromVariant(const QVariant &v)
{
QVariantMap data = v.toMap();
variable = data["variable"].toString();
value = data["value"].toString();
EnvironmentModification ret;
ret.name = data["variable"].toString().toUtf8().data();
ret.value = data["value"].toString().toUtf8().data();
QString t = data["type"].toString();
if(t == ToQStr(EnvMod::Append))
type = EnvMod::Append;
ret.mod = EnvMod::Append;
else if(t == ToQStr(EnvMod::Prepend))
type = EnvMod::Prepend;
ret.mod = EnvMod::Prepend;
else
type = EnvMod::Set;
ret.mod = EnvMod::Set;
QString s = data["separator"].toString();
if(s == ToQStr(EnvSep::SemiColon))
separator = EnvSep::SemiColon;
ret.sep = EnvSep::SemiColon;
else if(s == ToQStr(EnvSep::Colon))
separator = EnvSep::Colon;
ret.sep = EnvSep::Colon;
else if(s == ToQStr(EnvSep::Platform))
separator = EnvSep::Platform;
ret.sep = EnvSep::Platform;
else
separator = EnvSep::NoSep;
ret.sep = EnvSep::NoSep;
return ret;
}
CaptureSettings::CaptureSettings()
@@ -88,7 +65,7 @@ CaptureSettings::operator QVariant() const
QVariantList env;
for(int i = 0; i < Environment.size(); i++)
env.push_back((QVariant)Environment[i]);
env.push_back(EnvModToVariant(Environment[i]));
ret["Environment"] = env;
QVariantMap opts;
@@ -122,7 +99,7 @@ CaptureSettings::CaptureSettings(const QVariant &v)
QVariantList env = data["Environment"].toList();
for(int i = 0; i < env.size(); i++)
{
EnvironmentModification e(env[i]);
EnvironmentModification e = EnvModFromVariant(env[i]);
Environment.push_back(e);
}