From 35f9c53486b505ada0916d95fa01b86b3abb2c7e Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 7 Apr 2017 18:05:04 +0100 Subject: [PATCH] Rename *Method to *Callback to be more explicit in the name --- qrenderdoc/Code/CaptureContext.cpp | 4 ++-- qrenderdoc/Code/CaptureContext.h | 4 ++-- qrenderdoc/Code/Interface/QRDInterface.h | 22 +++++++++++----------- qrenderdoc/Code/ReplayManager.cpp | 10 +++++----- qrenderdoc/Code/ReplayManager.h | 14 +++++++------- qrenderdoc/Code/pyrenderdoc/qrenderdoc.i | 2 +- qrenderdoc/Windows/ShaderViewer.h | 8 ++++---- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/qrenderdoc/Code/CaptureContext.cpp b/qrenderdoc/Code/CaptureContext.cpp index a1c777324..07c030e12 100644 --- a/qrenderdoc/Code/CaptureContext.cpp +++ b/qrenderdoc/Code/CaptureContext.cpp @@ -774,8 +774,8 @@ void CaptureContext::ShowStatisticsViewer() IShaderViewer *CaptureContext::EditShader(bool customShader, const QString &entryPoint, const QStringMap &files, - IShaderViewer::SaveMethod saveCallback, - IShaderViewer::CloseMethod closeCallback, QWidget *parent) + IShaderViewer::SaveCallback saveCallback, + IShaderViewer::CloseCallback closeCallback, QWidget *parent) { return ShaderViewer::EditShader(*this, customShader, entryPoint, files, saveCallback, closeCallback, parent); diff --git a/qrenderdoc/Code/CaptureContext.h b/qrenderdoc/Code/CaptureContext.h index 179b7a366..628e07d08 100644 --- a/qrenderdoc/Code/CaptureContext.h +++ b/qrenderdoc/Code/CaptureContext.h @@ -147,8 +147,8 @@ public: void ShowStatisticsViewer() override; IShaderViewer *EditShader(bool customShader, const QString &entryPoint, const QStringMap &files, - IShaderViewer::SaveMethod saveCallback, - IShaderViewer::CloseMethod closeCallback, QWidget *parent) override; + IShaderViewer::SaveCallback saveCallback, + IShaderViewer::CloseCallback closeCallback, QWidget *parent) override; IShaderViewer *DebugShader(const ShaderBindpointMapping *bind, const ShaderReflection *shader, ShaderStage stage, ShaderDebugTrace *trace, diff --git a/qrenderdoc/Code/Interface/QRDInterface.h b/qrenderdoc/Code/Interface/QRDInterface.h index c5419d423..675b7c08b 100644 --- a/qrenderdoc/Code/Interface/QRDInterface.h +++ b/qrenderdoc/Code/Interface/QRDInterface.h @@ -191,8 +191,8 @@ DECLARE_REFLECTION_STRUCT(IStatisticsViewer); struct IShaderViewer { - typedef std::function SaveMethod; - typedef std::function CloseMethod; + typedef std::function SaveCallback; + typedef std::function CloseCallback; virtual QWidget *Widget() = 0; @@ -258,8 +258,8 @@ DECLARE_REFLECTION_STRUCT(ILogViewer); struct IReplayManager { - typedef std::function InvokeMethod; - typedef std::function &)> DirectoryBrowseMethod; + typedef std::function InvokeCallback; + typedef std::function &)> DirectoryBrowseCallback; virtual void DeleteCapture(const QString &logfile, bool local) = 0; @@ -269,9 +269,9 @@ struct IReplayManager // processed. // the manager processes only the request on the top of the queue, so when a new tagged invoke // comes in, we remove any other requests in the queue before it that have the same tag - virtual void AsyncInvoke(const QString &tag, InvokeMethod m) = 0; - virtual void AsyncInvoke(InvokeMethod m) = 0; - virtual void BlockInvoke(InvokeMethod m) = 0; + virtual void AsyncInvoke(const QString &tag, InvokeCallback m) = 0; + virtual void AsyncInvoke(InvokeCallback m) = 0; + virtual void BlockInvoke(InvokeCallback m) = 0; virtual ReplayStatus ConnectToRemoteServer(RemoteHost *host) = 0; virtual void DisconnectFromRemoteServer() = 0; @@ -284,8 +284,8 @@ struct IReplayManager const QString &logfile, CaptureOptions opts) = 0; virtual QStringList GetRemoteSupport() = 0; - virtual void GetHomeFolder(bool synchronous, DirectoryBrowseMethod cb) = 0; - virtual bool ListFolder(QString path, bool synchronous, DirectoryBrowseMethod cb) = 0; + virtual void GetHomeFolder(bool synchronous, DirectoryBrowseCallback cb) = 0; + virtual bool ListFolder(QString path, bool synchronous, DirectoryBrowseCallback cb) = 0; virtual QString CopyCaptureToRemote(const QString &localpath, QWidget *window) = 0; virtual void CopyCaptureFromRemote(const QString &remotepath, const QString &localpath, QWidget *window) = 0; @@ -391,8 +391,8 @@ struct ICaptureContext virtual void ShowStatisticsViewer() = 0; virtual IShaderViewer *EditShader(bool customShader, const QString &entryPoint, - const QStringMap &files, IShaderViewer::SaveMethod saveCallback, - IShaderViewer::CloseMethod closeCallback, QWidget *parent) = 0; + const QStringMap &files, IShaderViewer::SaveCallback saveCallback, + IShaderViewer::CloseCallback closeCallback, QWidget *parent) = 0; virtual IShaderViewer *DebugShader(const ShaderBindpointMapping *bind, const ShaderReflection *shader, ShaderStage stage, diff --git a/qrenderdoc/Code/ReplayManager.cpp b/qrenderdoc/Code/ReplayManager.cpp index f5b2e7a3e..453b2cb2f 100644 --- a/qrenderdoc/Code/ReplayManager.cpp +++ b/qrenderdoc/Code/ReplayManager.cpp @@ -99,7 +99,7 @@ QStringList ReplayManager::GetRemoteSupport() return ret; } -void ReplayManager::GetHomeFolder(bool synchronous, DirectoryBrowseMethod cb) +void ReplayManager::GetHomeFolder(bool synchronous, DirectoryBrowseCallback cb) { if(!m_Remote) return; @@ -127,7 +127,7 @@ void ReplayManager::GetHomeFolder(bool synchronous, DirectoryBrowseMethod cb) cb(home.c_str(), rdctype::array()); } -bool ReplayManager::ListFolder(QString path, bool synchronous, DirectoryBrowseMethod cb) +bool ReplayManager::ListFolder(QString path, bool synchronous, DirectoryBrowseCallback cb) { if(!m_Remote) return false; @@ -230,7 +230,7 @@ bool ReplayManager::IsRunning() return m_Thread && m_Thread->isRunning() && m_Running; } -void ReplayManager::AsyncInvoke(const QString &tag, ReplayManager::InvokeMethod m) +void ReplayManager::AsyncInvoke(const QString &tag, ReplayManager::InvokeCallback m) { { QMutexLocker autolock(&m_RenderLock); @@ -255,7 +255,7 @@ void ReplayManager::AsyncInvoke(const QString &tag, ReplayManager::InvokeMethod PushInvoke(cmd); } -void ReplayManager::AsyncInvoke(ReplayManager::InvokeMethod m) +void ReplayManager::AsyncInvoke(ReplayManager::InvokeCallback m) { InvokeHandle *cmd = new InvokeHandle(m); cmd->selfdelete = true; @@ -263,7 +263,7 @@ void ReplayManager::AsyncInvoke(ReplayManager::InvokeMethod m) PushInvoke(cmd); } -void ReplayManager::BlockInvoke(ReplayManager::InvokeMethod m) +void ReplayManager::BlockInvoke(ReplayManager::InvokeCallback m) { InvokeHandle *cmd = new InvokeHandle(m); diff --git a/qrenderdoc/Code/ReplayManager.h b/qrenderdoc/Code/ReplayManager.h index 0324a00fa..3398f4cdb 100644 --- a/qrenderdoc/Code/ReplayManager.h +++ b/qrenderdoc/Code/ReplayManager.h @@ -61,9 +61,9 @@ public: // processed. // the manager processes only the request on the top of the queue, so when a new tagged invoke // comes in, we remove any other requests in the queue before it that have the same tag - void AsyncInvoke(const QString &tag, InvokeMethod m); - void AsyncInvoke(InvokeMethod m); - void BlockInvoke(InvokeMethod m); + void AsyncInvoke(const QString &tag, InvokeCallback m); + void AsyncInvoke(InvokeCallback m); + void BlockInvoke(InvokeCallback m); void CloseThread(); @@ -78,15 +78,15 @@ public: CaptureOptions opts); QStringList GetRemoteSupport(); - void GetHomeFolder(bool synchronous, DirectoryBrowseMethod cb); - bool ListFolder(QString path, bool synchronous, DirectoryBrowseMethod cb); + void GetHomeFolder(bool synchronous, DirectoryBrowseCallback cb); + bool ListFolder(QString path, bool synchronous, DirectoryBrowseCallback cb); QString CopyCaptureToRemote(const QString &localpath, QWidget *window); void CopyCaptureFromRemote(const QString &remotepath, const QString &localpath, QWidget *window); private: struct InvokeHandle { - InvokeHandle(InvokeMethod m, const QString &t = QString()) + InvokeHandle(InvokeCallback m, const QString &t = QString()) { tag = t; method = m; @@ -94,7 +94,7 @@ private: } QString tag; - InvokeMethod method; + InvokeCallback method; QSemaphore processed; bool selfdelete; }; diff --git a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i index 3b83dbedc..00ec2e1bf 100644 --- a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i +++ b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i @@ -62,7 +62,7 @@ CONTAINER_TYPEMAPS(QMap) %rename("%s") IReplayManager::BlockInvoke; %extend IReplayManager { - void BlockInvoke(InvokeMethod m) { + void BlockInvoke(InvokeCallback m) { Py_BEGIN_ALLOW_THREADS $self->BlockInvoke(m); Py_END_ALLOW_THREADS diff --git a/qrenderdoc/Windows/ShaderViewer.h b/qrenderdoc/Windows/ShaderViewer.h index 3d558ac83..093fdff8e 100644 --- a/qrenderdoc/Windows/ShaderViewer.h +++ b/qrenderdoc/Windows/ShaderViewer.h @@ -47,8 +47,8 @@ class ShaderViewer : public QFrame, public IShaderViewer, public ILogViewer public: static IShaderViewer *EditShader(ICaptureContext &ctx, bool customShader, const QString &entryPoint, - const QStringMap &files, IShaderViewer::SaveMethod saveCallback, - IShaderViewer::CloseMethod closeCallback, QWidget *parent) + const QStringMap &files, IShaderViewer::SaveCallback saveCallback, + IShaderViewer::CloseCallback closeCallback, QWidget *parent) { ShaderViewer *ret = new ShaderViewer(ctx, parent); ret->m_SaveCallback = saveCallback; @@ -157,8 +157,8 @@ private: QPair prevResult; } m_FindState; - SaveMethod m_SaveCallback; - CloseMethod m_CloseCallback; + SaveCallback m_SaveCallback; + CloseCallback m_CloseCallback; ShaderDebugTrace *m_Trace = NULL; int m_CurrentStep;