lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-25 07:56:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable QT_NO_CAST_FROM_ASCII & QT_NO_CAST_TO_ASCII

Browse Source 
* Added a couple of utility macros to help with the conversion. lit() is
  paired with tr() for untranslated text.
* QFormatStr is more explicitly for non-textual formatting strings.
* Both are just #define'd to QStringLiteral()
This commit is contained in:
baldurk
2017-05-02 22:58:12 +01:00
parent 474ba91d8b
commit 0ecc6ca877
50 changed files with 2076 additions and 1921 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qrenderdoc/Windows/ConstantBufferPreviewer.cpp
+12 -10
View File
@@ -149,7 +149,7 @@ void ConstantBufferPreviewer::on_setFormat_toggled(bool checked)
ui->splitter->setSizes({1, 0});
ui->splitter->handle(1)->setEnabled(false);
processFormat("");
processFormat(QString());
return;
}
@@ -167,7 +167,7 @@ void ConstantBufferPreviewer::processFormat(const QString &format)
if(format.isEmpty())
{
m_formatOverride.clear();
ui->formatSpecifier->setErrors("");
ui->formatSpecifier->setErrors(QString());
}
else
{
@@ -192,8 +192,8 @@ void ConstantBufferPreviewer::addVariables(RDTreeWidgetItem *root,
if(v.rows > 1)
{
for(uint32_t i = 0; i < v.rows; i++)
n->addChild(new RDTreeWidgetItem(
{QString("%1.row%2").arg(ToQStr(v.name)).arg(i), RowString(v, i), RowTypeString(v)}));
n->addChild(new RDTreeWidgetItem({QFormatStr("%1.row%2").arg(ToQStr(v.name)).arg(i),
RowString(v, i), RowTypeString(v)}));
}
if(v.members.count > 0)
@@ -282,14 +282,14 @@ void ConstantBufferPreviewer::setVariables(const rdctype::array<ShaderVariable>
void ConstantBufferPreviewer::updateLabels()
{
QString bufName = "";
QString bufName;
bool needName = true;
BufferDescription *buf = m_Ctx.GetBuffer(m_cbuffer);
if(buf)
{
bufName = buf->name;
bufName = ToQStr(buf->name);
if(buf->customName)
needName = false;
}
@@ -300,18 +300,20 @@ void ConstantBufferPreviewer::updateLabels()
{
if(needName && (int)m_slot < reflection->ConstantBlocks.count &&
reflection->ConstantBlocks[m_slot].name.count > 0)
bufName = "<" + ToQStr(reflection->ConstantBlocks[m_slot].name) + ">";
bufName = QFormatStr("<%1>").arg(ToQStr(reflection->ConstantBlocks[m_slot].name));
}
ui->nameLabel->setText(bufName);
GraphicsAPI pipeType = m_Ctx.APIProps().pipelineType;
QString title =
QString("%1 %2 %3").arg(ToQStr(m_stage, pipeType)).arg(IsD3D(pipeType) ? "CB" : "UBO").arg(m_slot);
QString title = QFormatStr("%1 %2 %3")
.arg(ToQStr(m_stage, pipeType))
.arg(IsD3D(pipeType) ? lit("CB") : lit("UBO"))
.arg(m_slot);
if(m_Ctx.CurPipelineState().SupportsResourceArrays())
title += QString(" [%1]").arg(m_arrayIdx);
title += QFormatStr(" [%1]").arg(m_arrayIdx);
ui->slotLabel->setText(title);
setWindowTitle(title);