From ceb73b85d9ac24769b28a8b414f3c1f38650cc2b Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 7 Apr 2017 16:24:05 +0100 Subject: [PATCH] Rename ILogViewerForm to ILogViewer --- qrenderdoc/Code/CaptureContext.cpp | 12 ++++++------ qrenderdoc/Code/CaptureContext.h | 10 +++++----- qrenderdoc/Code/Interface/QRDInterface.h | 14 +++++++------- qrenderdoc/Windows/APIInspector.h | 2 +- qrenderdoc/Windows/BufferViewer.h | 2 +- qrenderdoc/Windows/ConstantBufferPreviewer.h | 2 +- qrenderdoc/Windows/DebugMessageView.h | 2 +- qrenderdoc/Windows/EventBrowser.h | 2 +- qrenderdoc/Windows/MainWindow.h | 2 +- .../PipelineState/D3D11PipelineStateViewer.h | 2 +- .../PipelineState/D3D12PipelineStateViewer.h | 2 +- .../Windows/PipelineState/GLPipelineStateViewer.h | 2 +- .../Windows/PipelineState/PipelineStateViewer.h | 4 ++-- .../PipelineState/VulkanPipelineStateViewer.h | 2 +- qrenderdoc/Windows/PixelHistoryView.h | 2 +- qrenderdoc/Windows/ShaderViewer.h | 2 +- qrenderdoc/Windows/StatisticsViewer.h | 2 +- qrenderdoc/Windows/TextureViewer.h | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp index 00c62471e..a1c777324 100644 --- a/qrenderdoc/Code/CaptureContext.cpp +++ b/qrenderdoc/Code/CaptureContext.cpp @@ -130,7 +130,7 @@ void CaptureContext::LoadLogfile(const QString &logFile, const QString &origFile if(m_LogLoaded) { - QVector logviewers(m_LogViewers); + QVector logviewers(m_LogViewers); // make sure we're on a consistent event before invoking log viewer forms const DrawcallDescription *draw = &m_Drawcalls.back(); @@ -141,7 +141,7 @@ void CaptureContext::LoadLogfile(const QString &logFile, const QString &origFile GUIInvoke::blockcall([&logviewers]() { // notify all the registers log viewers that a log has been loaded - for(ILogViewerForm *logviewer : logviewers) + for(ILogViewer *logviewer : logviewers) { if(logviewer) logviewer->OnLogfileLoaded(); @@ -536,16 +536,16 @@ void CaptureContext::CloseLogfile() m_LogLoaded = false; - QVector logviewers(m_LogViewers); + QVector logviewers(m_LogViewers); - for(ILogViewerForm *logviewer : logviewers) + for(ILogViewer *logviewer : logviewers) { if(logviewer) logviewer->OnLogfileClosed(); } } -void CaptureContext::SetEventID(const QVector &exclude, uint32_t selectedEventID, +void CaptureContext::SetEventID(const QVector &exclude, uint32_t selectedEventID, uint32_t eventID, bool force) { uint32_t prevSelectedEventID = m_SelectedEventID; @@ -563,7 +563,7 @@ void CaptureContext::SetEventID(const QVector &exclude, uint32 &m_CurGLPipelineState, &m_CurVulkanPipelineState); }); - for(ILogViewerForm *logviewer : m_LogViewers) + for(ILogViewer *logviewer : m_LogViewers) { if(exclude.contains(logviewer)) continue; diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h index 8e2eb3522..179b7a366 100644 --- a/qrenderdoc/Code/CaptureContext.h +++ b/qrenderdoc/Code/CaptureContext.h @@ -69,10 +69,10 @@ public: void CloseLogfile() override; - void SetEventID(const QVector &exclude, uint32_t selectedEventID, - uint32_t eventID, bool force = false) override; + void SetEventID(const QVector &exclude, uint32_t selectedEventID, uint32_t eventID, + bool force = false) override; void RefreshStatus() override { SetEventID({}, m_SelectedEventID, m_EventID, true); } - void AddLogViewer(ILogViewerForm *f) override + void AddLogViewer(ILogViewer *f) override { m_LogViewers.push_back(f); @@ -83,7 +83,7 @@ public: } } - void RemoveLogViewer(ILogViewerForm *f) override { m_LogViewers.removeAll(f); } + void RemoveLogViewer(ILogViewer *f) override { m_LogViewers.removeAll(f); } ////////////////////////////////////////////////////////////////////////////// // Accessors @@ -191,7 +191,7 @@ private: PersistantConfig &m_Config; - QVector m_LogViewers; + QVector m_LogViewers; bool m_LogLoaded, m_LoadInProgress, m_LogLocal; QString m_LogFile; diff --git a/qrenderdoc/Code/Interface/QRDInterface.h b/qrenderdoc/Code/Interface/QRDInterface.h index 59bc99471..c5419d423 100644 --- a/qrenderdoc/Code/Interface/QRDInterface.h +++ b/qrenderdoc/Code/Interface/QRDInterface.h @@ -233,7 +233,7 @@ protected: DECLARE_REFLECTION_STRUCT(IPixelHistoryView); -struct ILogViewerForm +struct ILogViewer { virtual void OnLogfileLoaded() = 0; virtual void OnLogfileClosed() = 0; @@ -250,11 +250,11 @@ struct ILogViewerForm virtual void OnEventChanged(uint32_t eventID) = 0; protected: - ILogViewerForm() = default; - ~ILogViewerForm() = default; + ILogViewer() = default; + ~ILogViewer() = default; }; -DECLARE_REFLECTION_STRUCT(ILogViewerForm); +DECLARE_REFLECTION_STRUCT(ILogViewer); struct IReplayManager { @@ -325,12 +325,12 @@ struct ICaptureContext bool local) = 0; virtual void CloseLogfile() = 0; - virtual void SetEventID(const QVector &exclude, uint32_t selectedEventID, + virtual void SetEventID(const QVector &exclude, uint32_t selectedEventID, uint32_t eventID, bool force = false) = 0; virtual void RefreshStatus() = 0; - virtual void AddLogViewer(ILogViewerForm *f) = 0; - virtual void RemoveLogViewer(ILogViewerForm *f) = 0; + virtual void AddLogViewer(ILogViewer *f) = 0; + virtual void RemoveLogViewer(ILogViewer *f) = 0; ////////////////////////////////////////////////////////////////////////////// // Accessors diff --git a/qrenderdoc/Windows/APIInspector.h b/qrenderdoc/Windows/APIInspector.h index f9b973ac6..62d2c6858 100644 --- a/qrenderdoc/Windows/APIInspector.h +++ b/qrenderdoc/Windows/APIInspector.h @@ -32,7 +32,7 @@ namespace Ui class APIInspector; } -class APIInspector : public QFrame, public IAPIInspector, public ILogViewerForm +class APIInspector : public QFrame, public IAPIInspector, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/BufferViewer.h b/qrenderdoc/Windows/BufferViewer.h index 8cba142fe..12a52c923 100644 --- a/qrenderdoc/Windows/BufferViewer.h +++ b/qrenderdoc/Windows/BufferViewer.h @@ -52,7 +52,7 @@ struct BufferExport BufferExport(ExportFormat f) : format(f) {} }; -class BufferViewer : public QFrame, public IBufferViewer, public ILogViewerForm +class BufferViewer : public QFrame, public IBufferViewer, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/ConstantBufferPreviewer.h b/qrenderdoc/Windows/ConstantBufferPreviewer.h index c023f11ba..19e44d086 100644 --- a/qrenderdoc/Windows/ConstantBufferPreviewer.h +++ b/qrenderdoc/Windows/ConstantBufferPreviewer.h @@ -34,7 +34,7 @@ class ConstantBufferPreviewer; struct FormatElement; -class ConstantBufferPreviewer : public QFrame, public IConstantBufferPreviewer, public ILogViewerForm +class ConstantBufferPreviewer : public QFrame, public IConstantBufferPreviewer, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/DebugMessageView.h b/qrenderdoc/Windows/DebugMessageView.h index 95a4c05d3..da907ab5e 100644 --- a/qrenderdoc/Windows/DebugMessageView.h +++ b/qrenderdoc/Windows/DebugMessageView.h @@ -37,7 +37,7 @@ class QMenu; class DebugMessageItemModel; class DebugMessageFilterModel; -class DebugMessageView : public QFrame, public IDebugMessageView, public ILogViewerForm +class DebugMessageView : public QFrame, public IDebugMessageView, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/EventBrowser.h b/qrenderdoc/Windows/EventBrowser.h index 1b63a3486..c7fe2550f 100644 --- a/qrenderdoc/Windows/EventBrowser.h +++ b/qrenderdoc/Windows/EventBrowser.h @@ -40,7 +40,7 @@ class QTimer; class FlowLayout; class SizeDelegate; -class EventBrowser : public QFrame, public IEventBrowser, public ILogViewerForm +class EventBrowser : public QFrame, public IEventBrowser, public ILogViewer { private: Q_OBJECT diff --git a/qrenderdoc/Windows/MainWindow.h b/qrenderdoc/Windows/MainWindow.h index 7e203a01f..53d89a12f 100644 --- a/qrenderdoc/Windows/MainWindow.h +++ b/qrenderdoc/Windows/MainWindow.h @@ -42,7 +42,7 @@ class QToolButton; class CaptureDialog; class LiveCapture; -class MainWindow : public QMainWindow, public IMainWindow, public ILogViewerForm +class MainWindow : public QMainWindow, public IMainWindow, public ILogViewer { private: Q_OBJECT diff --git a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h index 89ca376c6..d36fb090c 100644 --- a/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/D3D11PipelineStateViewer.h @@ -37,7 +37,7 @@ class QTreeWidgetItem; struct ViewTag; class PipelineStateViewer; -class D3D11PipelineStateViewer : public QFrame, public ILogViewerForm +class D3D11PipelineStateViewer : public QFrame, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h index fcfc15e82..2ef07a152 100644 --- a/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/D3D12PipelineStateViewer.h @@ -37,7 +37,7 @@ class QTreeWidgetItem; struct ViewTag; class PipelineStateViewer; -class D3D12PipelineStateViewer : public QFrame, public ILogViewerForm +class D3D12PipelineStateViewer : public QFrame, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h index 315358473..5f1487ae0 100644 --- a/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/GLPipelineStateViewer.h @@ -36,7 +36,7 @@ class RDTreeWidget; class QTreeWidgetItem; class PipelineStateViewer; -class GLPipelineStateViewer : public QFrame, public ILogViewerForm +class GLPipelineStateViewer : public QFrame, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h index 90473f919..0bf3ba076 100644 --- a/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/PipelineStateViewer.h @@ -37,7 +37,7 @@ class D3D12PipelineStateViewer; class GLPipelineStateViewer; class VulkanPipelineStateViewer; -class PipelineStateViewer : public QFrame, public IPipelineStateViewer, public ILogViewerForm +class PipelineStateViewer : public QFrame, public IPipelineStateViewer, public ILogViewer { Q_OBJECT @@ -79,5 +79,5 @@ private: D3D12PipelineStateViewer *m_D3D12; GLPipelineStateViewer *m_GL; VulkanPipelineStateViewer *m_Vulkan; - ILogViewerForm *m_Current; + ILogViewer *m_Current; }; diff --git a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h index 779adf3a0..77129f7a0 100644 --- a/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h +++ b/qrenderdoc/Windows/PipelineState/VulkanPipelineStateViewer.h @@ -43,7 +43,7 @@ struct SamplerData QTreeWidgetItem *node; }; -class VulkanPipelineStateViewer : public QFrame, public ILogViewerForm +class VulkanPipelineStateViewer : public QFrame, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/PixelHistoryView.h b/qrenderdoc/Windows/PixelHistoryView.h index 12f3e9765..d5f057294 100644 --- a/qrenderdoc/Windows/PixelHistoryView.h +++ b/qrenderdoc/Windows/PixelHistoryView.h @@ -35,7 +35,7 @@ class PixelHistoryView; class PixelHistoryItemModel; struct EventTag; -class PixelHistoryView : public QFrame, public IPixelHistoryView, public ILogViewerForm +class PixelHistoryView : public QFrame, public IPixelHistoryView, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/ShaderViewer.h b/qrenderdoc/Windows/ShaderViewer.h index 530266c01..3d558ac83 100644 --- a/qrenderdoc/Windows/ShaderViewer.h +++ b/qrenderdoc/Windows/ShaderViewer.h @@ -41,7 +41,7 @@ class FindReplace; // from Scintilla typedef intptr_t sptr_t; -class ShaderViewer : public QFrame, public IShaderViewer, public ILogViewerForm +class ShaderViewer : public QFrame, public IShaderViewer, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/StatisticsViewer.h b/qrenderdoc/Windows/StatisticsViewer.h index 959a78c5d..2d37d492b 100644 --- a/qrenderdoc/Windows/StatisticsViewer.h +++ b/qrenderdoc/Windows/StatisticsViewer.h @@ -32,7 +32,7 @@ namespace Ui class StatisticsViewer; } -class StatisticsViewer : public QFrame, public IStatisticsViewer, public ILogViewerForm +class StatisticsViewer : public QFrame, public IStatisticsViewer, public ILogViewer { Q_OBJECT diff --git a/qrenderdoc/Windows/TextureViewer.h b/qrenderdoc/Windows/TextureViewer.h index 884f56fc7..1cd57d08c 100644 --- a/qrenderdoc/Windows/TextureViewer.h +++ b/qrenderdoc/Windows/TextureViewer.h @@ -114,7 +114,7 @@ struct TexSettings CompType typeHint; }; -class TextureViewer : public QFrame, public ITextureViewer, public ILogViewerForm +class TextureViewer : public QFrame, public ITextureViewer, public ILogViewer { private: Q_OBJECT