From 58b628ee8b20cba23c7dfd5cb2c7af3785de0a17 Mon Sep 17 00:00:00 2001 From: Cory Bloor Date: Sun, 12 Nov 2017 16:16:16 -0700 Subject: [PATCH] Fix unused variables In almost all cases these can be removed. The only exception is in ShaderViewer.cpp, where regIdx should have been used. --- qrenderdoc/Code/CaptureContext.cpp | 2 -- qrenderdoc/Code/Interface/CommonPipelineState.cpp | 2 -- qrenderdoc/Code/pyrenderdoc/PythonContext.cpp | 6 +----- qrenderdoc/Widgets/Extended/RDHeaderView.cpp | 1 - qrenderdoc/Windows/BufferViewer.cpp | 2 -- qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp | 1 - qrenderdoc/Windows/MainWindow.cpp | 1 - qrenderdoc/Windows/ShaderViewer.cpp | 2 +- qrenderdoc/Windows/TimelineBar.cpp | 1 - 9 files changed, 2 insertions(+), 16 deletions(-) diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp index cfbe6d1b0..594abe13c 100644 --- a/qrenderdoc/Code/CaptureContext.cpp +++ b/qrenderdoc/Code/CaptureContext.cpp @@ -86,8 +86,6 @@ CaptureContext::CaptureContext(QString paramFilename, QString remoteHost, uint32 if(!paramFilename.isEmpty()) { - QFileInfo fi(paramFilename); - m_MainWindow->LoadFromFilename(paramFilename, temp); if(temp) m_MainWindow->takeCaptureOwnership(); diff --git a/qrenderdoc/Code/Interface/CommonPipelineState.cpp b/qrenderdoc/Code/Interface/CommonPipelineState.cpp index 6523ed04e..22c781435 100644 --- a/qrenderdoc/Code/Interface/CommonPipelineState.cpp +++ b/qrenderdoc/Code/Interface/CommonPipelineState.cpp @@ -461,8 +461,6 @@ ResourceId CommonPipelineState::GetShader(ShaderStage stage) QString CommonPipelineState::GetShaderName(ShaderStage stage) { - QString ret; - if(IsCaptureLoaded()) { if(IsCaptureD3D11()) diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp index 758b56fc1..8db94b8ed 100644 --- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp +++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp @@ -410,10 +410,6 @@ PythonContext::PythonContext(QObject *parent) : QObject(parent) // clone our own local context context_namespace = PyDict_Copy(main_dict); - QString typeStr; - QString valueStr; - QList frames; - // for compatibility with earlier versions of python that took a char * instead of const char * char noparams[1] = ""; @@ -873,4 +869,4 @@ extern "C" void SetThreadBlocking(PyObject *global_handle, bool block) OutputRedirector *redirector = (OutputRedirector *)global_handle; if(redirector && redirector->context) return redirector->context->setThreadBlocking(block); -} \ No newline at end of file +} diff --git a/qrenderdoc/Widgets/Extended/RDHeaderView.cpp b/qrenderdoc/Widgets/Extended/RDHeaderView.cpp index 127b98b06..74eff7802 100644 --- a/qrenderdoc/Widgets/Extended/RDHeaderView.cpp +++ b/qrenderdoc/Widgets/Extended/RDHeaderView.cpp @@ -835,7 +835,6 @@ void RDHeaderView::paintSection(QPainter *painter, const QRect &rect, int sectio else opt.state &= ~(QStyle::State_Active | QStyle::State_HasFocus); - QVariant textAlignment = m->headerData(section, orientation(), Qt::TextAlignmentRole); opt.rect = rect; opt.section = section; opt.textAlignment = defaultAlignment(); diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp index f00dd7885..01ff3cfe4 100644 --- a/qrenderdoc/Windows/BufferViewer.cpp +++ b/qrenderdoc/Windows/BufferViewer.cpp @@ -2264,8 +2264,6 @@ void BufferViewer::configureMeshColumns() else m_ModelVSIn->numRows = draw->numIndices; - QVector vbs = m_Ctx.CurPipelineState().GetVBuffers(); - Viewport vp = m_Ctx.CurPipelineState().GetViewport(0); m_Config.fov = ui->fovGuess->value(); diff --git a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp index 08daedde4..4f832c386 100644 --- a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp @@ -529,7 +529,6 @@ void TextureSaveDialog::on_browse_clicked() QString filename = RDDialog::getSaveFileName(this, tr("Save Texture As"), QString(), filter, selectedFilter); - QFileInfo checkFile(filename); if(!filename.isEmpty()) { ui->filename->setText(filename); diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index 62ec55a21..e72686ddd 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -1723,7 +1723,6 @@ void MainWindow::on_action_Settings_triggered() void MainWindow::on_action_View_Documentation_triggered() { QFileInfo fi(QGuiApplication::applicationFilePath()); - QDir curDir = QFileInfo(QGuiApplication::applicationFilePath()).absoluteDir(); if(fi.absoluteDir().exists(lit("renderdoc.chm"))) QDesktopServices::openUrl( diff --git a/qrenderdoc/Windows/ShaderViewer.cpp b/qrenderdoc/Windows/ShaderViewer.cpp index 15b1b7f05..7d6f854ad 100644 --- a/qrenderdoc/Windows/ShaderViewer.cpp +++ b/qrenderdoc/Windows/ShaderViewer.cpp @@ -515,7 +515,7 @@ void ShaderViewer::debugShader(const ShaderBindpointMapping *bind, const ShaderR s.systemValue == ShaderBuiltin::Undefined ? QString::number(s.regIndex) : lit("-"); ui->inputSig->addTopLevelItem(new RDTreeWidgetItem( - {name, semIdx, QString::number(s.regIndex), TypeString(s), ToQStr(s.systemValue), + {name, semIdx, regIdx, TypeString(s), ToQStr(s.systemValue), GetComponentString(s.regChannelMask), GetComponentString(s.channelUsedMask)})); } diff --git a/qrenderdoc/Windows/TimelineBar.cpp b/qrenderdoc/Windows/TimelineBar.cpp index 29bab0908..1b20ec194 100644 --- a/qrenderdoc/Windows/TimelineBar.cpp +++ b/qrenderdoc/Windows/TimelineBar.cpp @@ -858,7 +858,6 @@ void TimelineBar::paintMarkers(QPainter &p, const QVector &markers, if(elided == tooshort) elided = QString(); - QRectF textRect = r; r.setLeft(qRound(r.left() + margin)); p.drawText(r, elided, to);