From e75a468d3cc094a149f1278d2c868e3c69c5b066 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 22 Nov 2017 13:34:05 +0000 Subject: [PATCH] Remove direct include of Code/CaptureContext.h in almost all files * This is a leftover from before the interface was hoisted out, and most windows were still calling directly to CaptureContext instead of via the public ICaptureContext interface --- qrenderdoc/Code/CaptureContext.h | 3 --- qrenderdoc/Code/Interface/QRDInterface.cpp | 2 +- qrenderdoc/Code/Interface/QRDInterface.h | 24 +++++++++++-------- qrenderdoc/Code/ReplayManager.h | 4 ---- qrenderdoc/Code/precompiled.h | 1 - qrenderdoc/Code/qrenderdoc.cpp | 2 +- qrenderdoc/Widgets/CustomPaintWidget.cpp | 1 - qrenderdoc/Windows/APIInspector.h | 1 - qrenderdoc/Windows/BufferViewer.cpp | 1 + qrenderdoc/Windows/BufferViewer.h | 2 +- qrenderdoc/Windows/CommentView.h | 1 - qrenderdoc/Windows/ConstantBufferPreviewer.h | 1 - qrenderdoc/Windows/DebugMessageView.h | 1 - qrenderdoc/Windows/Dialogs/CaptureDialog.h | 1 - qrenderdoc/Windows/Dialogs/LiveCapture.h | 1 - .../Dialogs/PerformanceCounterSelection.cpp | 1 - qrenderdoc/Windows/Dialogs/SettingsDialog.cpp | 1 - .../Windows/Dialogs/TextureSaveDialog.cpp | 1 - qrenderdoc/Windows/Dialogs/TipsDialog.h | 2 -- .../Windows/Dialogs/VirtualFileDialog.cpp | 1 - qrenderdoc/Windows/EventBrowser.cpp | 1 - qrenderdoc/Windows/EventBrowser.h | 1 - qrenderdoc/Windows/MainWindow.cpp | 3 +-- qrenderdoc/Windows/MainWindow.h | 1 - qrenderdoc/Windows/PerformanceCounterViewer.h | 1 - .../PipelineState/D3D11PipelineStateViewer.h | 1 - .../PipelineState/D3D12PipelineStateViewer.h | 1 - .../PipelineState/GLPipelineStateViewer.h | 1 - .../PipelineState/PipelineStateViewer.h | 1 - .../PipelineState/VulkanPipelineStateViewer.h | 1 - qrenderdoc/Windows/PixelHistoryView.h | 1 - qrenderdoc/Windows/PythonShell.cpp | 4 ---- qrenderdoc/Windows/PythonShell.h | 1 - qrenderdoc/Windows/ResourceInspector.h | 1 - qrenderdoc/Windows/ShaderViewer.h | 1 - qrenderdoc/Windows/StatisticsViewer.h | 1 - qrenderdoc/Windows/TextureViewer.cpp | 15 ++++++------ qrenderdoc/Windows/TextureViewer.h | 1 - qrenderdoc/Windows/TimelineBar.h | 1 - 39 files changed, 26 insertions(+), 64 deletions(-) diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h index aa7bfd752..18dd8cf2f 100644 --- a/qrenderdoc/Code/CaptureContext.h +++ b/qrenderdoc/Code/CaptureContext.h @@ -52,8 +52,6 @@ class TimelineBar; class PythonShell; class ResourceInspector; -QString ConfigFilePath(const QString &filename); - class CaptureContext : public ICaptureContext { Q_DECLARE_TR_FUNCTIONS(CaptureContext); @@ -65,7 +63,6 @@ public: bool isRunning(); - QString ConfigFilePath(const QString &filename) override { return ::ConfigFilePath(filename); } QString TempCaptureFilename(QString appname) override; ////////////////////////////////////////////////////////////////////////////// diff --git a/qrenderdoc/Code/Interface/QRDInterface.cpp b/qrenderdoc/Code/Interface/QRDInterface.cpp index 9db5ceba0..7102ea5f6 100644 --- a/qrenderdoc/Code/Interface/QRDInterface.cpp +++ b/qrenderdoc/Code/Interface/QRDInterface.cpp @@ -121,7 +121,7 @@ CaptureSettings::CaptureSettings(const QVariant &v) Options.DebugOutputMute = opts[lit("DebugOutputMute")].toBool(); } -QString ConfigFilePath(const QString &filename) +QString configFilePath(const QString &filename) { QString path = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); diff --git a/qrenderdoc/Code/Interface/QRDInterface.h b/qrenderdoc/Code/Interface/QRDInterface.h index 979a0a38c..8810d6298 100644 --- a/qrenderdoc/Code/Interface/QRDInterface.h +++ b/qrenderdoc/Code/Interface/QRDInterface.h @@ -946,15 +946,6 @@ struct EventBookmark DOCUMENT("The capture context that the python script is running in.") struct ICaptureContext { - DOCUMENT(R"(Retrieve the absolute path where a given file can be stored with other application -data. - -:param str filename: The base filename. -:return: The absolute path. -:rtype: ``str`` -)"); - virtual QString ConfigFilePath(const QString &filename) = 0; - DOCUMENT(R"(Retrieve the absolute path where a given temporary capture should be stored. data. @@ -1794,4 +1785,17 @@ This may return ``None`` if no capture context can be found. :return: The capture context associated with this widget, if one unambiguously exists. :rtype: CaptureContext )"); -ICaptureContext *getCaptureContext(const QWidget *widget); \ No newline at end of file +ICaptureContext *getCaptureContext(const QWidget *widget); + +DOCUMENT(R"(Retrieve the absolute path where a given file can be stored with other application +data. + +:param str filename: The base filename. +:return: The absolute path. +:rtype: ``str`` +)"); +QString configFilePath(const QString &filename); + +// simple helper for the common case of 'we just need to run this on the replay thread' +#define INVOKE_MEMFN(function) \ + m_Ctx.Replay().AsyncInvoke([this](IReplayController *r) { function(r); }); diff --git a/qrenderdoc/Code/ReplayManager.h b/qrenderdoc/Code/ReplayManager.h index 8b647e408..5f35aef43 100644 --- a/qrenderdoc/Code/ReplayManager.h +++ b/qrenderdoc/Code/ReplayManager.h @@ -39,10 +39,6 @@ struct IReplayController; class LambdaThread; class RemoteHost; -// simple helper for the common case of 'we just need to run this on the render thread -#define INVOKE_MEMFN(function) \ - m_Ctx.Replay().AsyncInvoke([this](IReplayController *r) { function(r); }); - class ReplayManager : public IReplayManager { Q_DECLARE_TR_FUNCTIONS(ReplayManager); diff --git a/qrenderdoc/Code/precompiled.h b/qrenderdoc/Code/precompiled.h index 733c95b4e..4c89e1afe 100644 --- a/qrenderdoc/Code/precompiled.h +++ b/qrenderdoc/Code/precompiled.h @@ -24,6 +24,5 @@ #pragma once -#include "Code/CaptureContext.h" #include "Code/Interface/QRDInterface.h" #include "Code/QRDUtils.h" diff --git a/qrenderdoc/Code/qrenderdoc.cpp b/qrenderdoc/Code/qrenderdoc.cpp index 8fa1d48b4..f18dc5381 100644 --- a/qrenderdoc/Code/qrenderdoc.cpp +++ b/qrenderdoc/Code/qrenderdoc.cpp @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) dir.mkpath(configPath); } - QString configFilename = ConfigFilePath(lit("UI.config")); + QString configFilename = configFilePath(lit("UI.config")); if(!config.Load(configFilename)) { diff --git a/qrenderdoc/Widgets/CustomPaintWidget.cpp b/qrenderdoc/Widgets/CustomPaintWidget.cpp index 177f21593..f28ce72e5 100644 --- a/qrenderdoc/Widgets/CustomPaintWidget.cpp +++ b/qrenderdoc/Widgets/CustomPaintWidget.cpp @@ -25,7 +25,6 @@ #include "CustomPaintWidget.h" #include #include -#include "Code/CaptureContext.h" CustomPaintWidget::CustomPaintWidget(QWidget *parent) : QWidget(parent) { diff --git a/qrenderdoc/Windows/APIInspector.h b/qrenderdoc/Windows/APIInspector.h index 2960e2b71..a74793da1 100644 --- a/qrenderdoc/Windows/APIInspector.h +++ b/qrenderdoc/Windows/APIInspector.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/BufferViewer.cpp b/qrenderdoc/Windows/BufferViewer.cpp index c9402e0a3..970dba262 100644 --- a/qrenderdoc/Windows/BufferViewer.cpp +++ b/qrenderdoc/Windows/BufferViewer.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include diff --git a/qrenderdoc/Windows/BufferViewer.h b/qrenderdoc/Windows/BufferViewer.h index d6f4ab433..1b9efd785 100644 --- a/qrenderdoc/Windows/BufferViewer.h +++ b/qrenderdoc/Windows/BufferViewer.h @@ -25,7 +25,7 @@ #pragma once #include -#include "Code/CaptureContext.h" +#include namespace Ui { diff --git a/qrenderdoc/Windows/CommentView.h b/qrenderdoc/Windows/CommentView.h index b806bdcda..e7a2c9f98 100644 --- a/qrenderdoc/Windows/CommentView.h +++ b/qrenderdoc/Windows/CommentView.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.h b/qrenderdoc/Windows/ConstantBufferPreviewer.h index ec7bafcfb..5e23f76d0 100644 --- a/qrenderdoc/Windows/ConstantBufferPreviewer.h +++ b/qrenderdoc/Windows/ConstantBufferPreviewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/DebugMessageView.h b/qrenderdoc/Windows/DebugMessageView.h index 766268cd3..2c1aac39b 100644 --- a/qrenderdoc/Windows/DebugMessageView.h +++ b/qrenderdoc/Windows/DebugMessageView.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/Dialogs/CaptureDialog.h b/qrenderdoc/Windows/Dialogs/CaptureDialog.h index 37e6a7086..cd009266f 100644 --- a/qrenderdoc/Windows/Dialogs/CaptureDialog.h +++ b/qrenderdoc/Windows/Dialogs/CaptureDialog.h @@ -26,7 +26,6 @@ #include #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/Dialogs/LiveCapture.h b/qrenderdoc/Windows/Dialogs/LiveCapture.h index d67f4b2b6..5544a770b 100644 --- a/qrenderdoc/Windows/Dialogs/LiveCapture.h +++ b/qrenderdoc/Windows/Dialogs/LiveCapture.h @@ -28,7 +28,6 @@ #include #include #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp b/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp index 680a800a7..6a2ba406e 100644 --- a/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp +++ b/qrenderdoc/Windows/Dialogs/PerformanceCounterSelection.cpp @@ -25,7 +25,6 @@ #include "PerformanceCounterSelection.h" #include #include -#include "Code/CaptureContext.h" #include "Code/Interface/QRDInterface.h" #include "Code/Resources.h" #include "ui_PerformanceCounterSelection.h" diff --git a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp index 96a55b312..e328b424d 100644 --- a/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/SettingsDialog.cpp @@ -23,7 +23,6 @@ ******************************************************************************/ #include "SettingsDialog.h" -#include "Code/CaptureContext.h" #include "Code/Interface/QRDInterface.h" #include "Code/QRDUtils.h" #include "Styles/StyleData.h" diff --git a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp index 4f832c386..67eaba307 100644 --- a/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/TextureSaveDialog.cpp @@ -25,7 +25,6 @@ #include "TextureSaveDialog.h" #include #include -#include "Code/CaptureContext.h" #include "Code/QRDUtils.h" #include "ui_TextureSaveDialog.h" diff --git a/qrenderdoc/Windows/Dialogs/TipsDialog.h b/qrenderdoc/Windows/Dialogs/TipsDialog.h index 8dfeff093..4531b4a83 100644 --- a/qrenderdoc/Windows/Dialogs/TipsDialog.h +++ b/qrenderdoc/Windows/Dialogs/TipsDialog.h @@ -28,8 +28,6 @@ #include #include -#include "Code/CaptureContext.h" - namespace Ui { class TipsDialog; diff --git a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp index 2961db526..3b698e6a8 100644 --- a/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp +++ b/qrenderdoc/Windows/Dialogs/VirtualFileDialog.cpp @@ -29,7 +29,6 @@ #include #include #include -#include "Code/CaptureContext.h" #include "Code/ReplayManager.h" #include "Code/Resources.h" #include "ui_VirtualFileDialog.h" diff --git a/qrenderdoc/Windows/EventBrowser.cpp b/qrenderdoc/Windows/EventBrowser.cpp index 10e63d05e..fca27b095 100644 --- a/qrenderdoc/Windows/EventBrowser.cpp +++ b/qrenderdoc/Windows/EventBrowser.cpp @@ -29,7 +29,6 @@ #include #include #include "3rdparty/flowlayout/FlowLayout.h" -#include "Code/CaptureContext.h" #include "Code/QRDUtils.h" #include "Code/Resources.h" #include "Widgets/Extended/RDHeaderView.h" diff --git a/qrenderdoc/Windows/EventBrowser.h b/qrenderdoc/Windows/EventBrowser.h index 417ffd5dd..a02ed9675 100644 --- a/qrenderdoc/Windows/EventBrowser.h +++ b/qrenderdoc/Windows/EventBrowser.h @@ -26,7 +26,6 @@ #include #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/MainWindow.cpp b/qrenderdoc/Windows/MainWindow.cpp index e72686ddd..5bbc1eef7 100644 --- a/qrenderdoc/Windows/MainWindow.cpp +++ b/qrenderdoc/Windows/MainWindow.cpp @@ -33,7 +33,6 @@ #include #include #include -#include "Code/CaptureContext.h" #include "Code/QRDUtils.h" #include "Code/Resources.h" #include "Resources/resource.h" @@ -263,7 +262,7 @@ QString MainWindow::GetLayoutPath(int layout) if(layout > 0) filename = lit("Layout%1.config").arg(layout); - return ConfigFilePath(filename); + return configFilePath(filename); } void MainWindow::on_action_Exit_triggered() diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h index 0ee08b56a..03c8f8394 100644 --- a/qrenderdoc/Windows/MainWindow.h +++ b/qrenderdoc/Windows/MainWindow.h @@ -28,7 +28,6 @@ #include #include #include "3rdparty/toolwindowmanager/ToolWindowManager.h" -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PerformanceCounterViewer.h b/qrenderdoc/Windows/PerformanceCounterViewer.h index a69c62a59..b05cca527 100644 --- a/qrenderdoc/Windows/PerformanceCounterViewer.h +++ b/qrenderdoc/Windows/PerformanceCounterViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h index 9907f1823..af7450122 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h index 62f79298e..631e9ff3c 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h index c7d66e3c1..da6c2e694 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h index 50005010b..7e15808d9 100644 --- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h index 28ab673be..987672404 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PixelHistoryView.h b/qrenderdoc/Windows/PixelHistoryView.h index bef7032ae..062421539 100644 --- a/qrenderdoc/Windows/PixelHistoryView.h +++ b/qrenderdoc/Windows/PixelHistoryView.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/PythonShell.cpp b/qrenderdoc/Windows/PythonShell.cpp index 5c5ddf72b..c7174f278 100644 --- a/qrenderdoc/Windows/PythonShell.cpp +++ b/qrenderdoc/Windows/PythonShell.cpp @@ -46,10 +46,6 @@ struct CaptureContextInvoker : ICaptureContext // pass-through functions that don't need the UI thread /////////////////////////////////////////////////////////////////////// // - virtual QString ConfigFilePath(const QString &filename) override - { - return m_Ctx.ConfigFilePath(filename); - } virtual QString TempCaptureFilename(QString appname) override { return m_Ctx.TempCaptureFilename(appname); diff --git a/qrenderdoc/Windows/PythonShell.h b/qrenderdoc/Windows/PythonShell.h index ba02f75e7..909c7b038 100644 --- a/qrenderdoc/Windows/PythonShell.h +++ b/qrenderdoc/Windows/PythonShell.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" class PythonContext; class ScintillaEdit; diff --git a/qrenderdoc/Windows/ResourceInspector.h b/qrenderdoc/Windows/ResourceInspector.h index 092c3ecbc..5a14e407c 100644 --- a/qrenderdoc/Windows/ResourceInspector.h +++ b/qrenderdoc/Windows/ResourceInspector.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/ShaderViewer.h b/qrenderdoc/Windows/ShaderViewer.h index b744b7440..23710c4c4 100644 --- a/qrenderdoc/Windows/ShaderViewer.h +++ b/qrenderdoc/Windows/ShaderViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/StatisticsViewer.h b/qrenderdoc/Windows/StatisticsViewer.h index 9918dcfe8..f6a22d2bf 100644 --- a/qrenderdoc/Windows/StatisticsViewer.h +++ b/qrenderdoc/Windows/StatisticsViewer.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/TextureViewer.cpp b/qrenderdoc/Windows/TextureViewer.cpp index 5076bab81..dd5109d47 100644 --- a/qrenderdoc/Windows/TextureViewer.cpp +++ b/qrenderdoc/Windows/TextureViewer.cpp @@ -37,7 +37,6 @@ #include #include "3rdparty/flowlayout/FlowLayout.h" #include "3rdparty/toolwindowmanager/ToolWindowManagerArea.h" -#include "Code/CaptureContext.h" #include "Code/QRDUtils.h" #include "Code/Resources.h" #include "Dialogs/TextureSaveDialog.h" @@ -2460,7 +2459,7 @@ void TextureViewer::OnCaptureLoaded() GUIInvoke::call([this]() { OnEventChanged(m_Ctx.CurEvent()); }); }); - m_Watcher = new QFileSystemWatcher({ConfigFilePath(QString())}, this); + m_Watcher = new QFileSystemWatcher({configFilePath(QString())}, this); QObject::connect(m_Watcher, &QFileSystemWatcher::fileChanged, this, &TextureViewer::customShaderModified); @@ -3559,7 +3558,7 @@ void TextureViewer::reloadCustomShaders(const QString &filter) } QStringList files = - QDir(ConfigFilePath(QString())) + QDir(configFilePath(QString())) .entryList({QFormatStr("*.%1").arg(m_Ctx.CurPipelineState().GetShaderExtension())}, QDir::Files | QDir::NoDotAndDotDot, QDir::Name | QDir::IgnoreCase); @@ -3572,11 +3571,11 @@ void TextureViewer::reloadCustomShaders(const QString &filter) QString fn = QFileInfo(f).baseName(); QString key = fn.toUpper(); - m_Watcher->addPath(ConfigFilePath(f)); + m_Watcher->addPath(configFilePath(f)); if(!m_CustomShaders.contains(key) && !m_CustomShadersBusy.contains(key)) { - QFile fileHandle(ConfigFilePath(f)); + QFile fileHandle(configFilePath(f)); if(fileHandle.open(QFile::ReadOnly | QFile::Text)) { QTextStream stream(&fileHandle); @@ -3635,7 +3634,7 @@ void TextureViewer::on_customCreate_clicked() return; } - QString path = ConfigFilePath(filename + lit(".") + m_Ctx.CurPipelineState().GetShaderExtension()); + QString path = configFilePath(filename + lit(".") + m_Ctx.CurPipelineState().GetShaderExtension()); QString src; @@ -3690,7 +3689,7 @@ void TextureViewer::on_customEdit_clicked() return; } - QString path = ConfigFilePath(filename + lit(".") + m_Ctx.CurPipelineState().GetShaderExtension()); + QString path = configFilePath(filename + lit(".") + m_Ctx.CurPipelineState().GetShaderExtension()); QString src; @@ -3769,7 +3768,7 @@ void TextureViewer::on_customDelete_clicked() if(res == QMessageBox::Yes) { QString path = - ConfigFilePath(shaderName + lit(".") + m_Ctx.CurPipelineState().GetShaderExtension()); + configFilePath(shaderName + lit(".") + m_Ctx.CurPipelineState().GetShaderExtension()); if(!QFileInfo::exists(path)) { RDDialog::critical( diff --git a/qrenderdoc/Windows/TextureViewer.h b/qrenderdoc/Windows/TextureViewer.h index 6a33a0f6a..7a70cb249 100644 --- a/qrenderdoc/Windows/TextureViewer.h +++ b/qrenderdoc/Windows/TextureViewer.h @@ -27,7 +27,6 @@ #include #include #include -#include "Code/CaptureContext.h" namespace Ui { diff --git a/qrenderdoc/Windows/TimelineBar.h b/qrenderdoc/Windows/TimelineBar.h index 6098ce403..796f4d9ce 100644 --- a/qrenderdoc/Windows/TimelineBar.h +++ b/qrenderdoc/Windows/TimelineBar.h @@ -25,7 +25,6 @@ #pragma once #include -#include "Code/CaptureContext.h" class TimelineBar : public QAbstractScrollArea, public ITimelineBar, public ICaptureViewer {