From a2ee3c3a9f01f5cb2f05f1e84a1b6c1931d9d4a4 Mon Sep 17 00:00:00 2001 From: Manuel Castilla Date: Wed, 13 Oct 2021 23:01:04 +0200 Subject: Cleanup: replace members `m_` prefix by `_` suffix in Compositor To convert old code to the current convention and use a single code style. --- source/blender/compositor/nodes/COM_DilateErodeNode.cc | 6 +++--- source/blender/compositor/nodes/COM_DilateErodeNode.h | 2 +- source/blender/compositor/nodes/COM_SocketProxyNode.cc | 4 ++-- source/blender/compositor/nodes/COM_SocketProxyNode.h | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source/blender/compositor/nodes') diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.cc b/source/blender/compositor/nodes/COM_DilateErodeNode.cc index dbd03b02b8e..ea7ce396189 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.cc +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.cc @@ -27,7 +27,7 @@ namespace blender::compositor { DilateErodeNode::DilateErodeNode(bNode *editorNode) : Node(editorNode) { /* initialize node data */ - NodeBlurData *data = &m_alpha_blur; + NodeBlurData *data = &alpha_blur_; memset(data, 0, sizeof(NodeBlurData)); data->filtertype = R_FILTER_GAUSS; @@ -86,7 +86,7 @@ void DilateErodeNode::convertToOperations(NodeConverter &converter, eCompositorQuality quality = context.getQuality(); GaussianAlphaXBlurOperation *operationx = new GaussianAlphaXBlurOperation(); - operationx->setData(&m_alpha_blur); + operationx->setData(&alpha_blur_); operationx->setQuality(quality); operationx->setFalloff(PROP_SMOOTH); converter.addOperation(operationx); @@ -96,7 +96,7 @@ void DilateErodeNode::convertToOperations(NodeConverter &converter, // yet GaussianAlphaYBlurOperation *operationy = new GaussianAlphaYBlurOperation(); - operationy->setData(&m_alpha_blur); + operationy->setData(&alpha_blur_); operationy->setQuality(quality); operationy->setFalloff(PROP_SMOOTH); converter.addOperation(operationy); diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h index 7684d7e3834..2a635a8b0a6 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.h +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h @@ -28,7 +28,7 @@ namespace blender::compositor { */ class DilateErodeNode : public Node { /** only used for blurring alpha, since the dilate/erode node doesn't have this. */ - NodeBlurData m_alpha_blur; + NodeBlurData alpha_blur_; public: DilateErodeNode(bNode *editorNode); diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.cc b/source/blender/compositor/nodes/COM_SocketProxyNode.cc index 4bd3eb0b058..1109dbaf735 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.cc +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.cc @@ -26,7 +26,7 @@ SocketProxyNode::SocketProxyNode(bNode *editorNode, bNodeSocket *editorInput, bNodeSocket *editorOutput, bool use_conversion) - : Node(editorNode, false), m_use_conversion(use_conversion) + : Node(editorNode, false), use_conversion_(use_conversion) { DataType dt; @@ -52,7 +52,7 @@ SocketProxyNode::SocketProxyNode(bNode *editorNode, void SocketProxyNode::convertToOperations(NodeConverter &converter, const CompositorContext & /*context*/) const { - NodeOperationOutput *proxy_output = converter.addInputProxy(getInputSocket(0), m_use_conversion); + NodeOperationOutput *proxy_output = converter.addInputProxy(getInputSocket(0), use_conversion_); converter.mapOutputSocket(getOutputSocket(), proxy_output); } diff --git a/source/blender/compositor/nodes/COM_SocketProxyNode.h b/source/blender/compositor/nodes/COM_SocketProxyNode.h index d19fb802767..2b584b344f0 100644 --- a/source/blender/compositor/nodes/COM_SocketProxyNode.h +++ b/source/blender/compositor/nodes/COM_SocketProxyNode.h @@ -37,16 +37,16 @@ class SocketProxyNode : public Node { bool getUseConversion() const { - return m_use_conversion; + return use_conversion_; } void setUseConversion(bool use_conversion) { - m_use_conversion = use_conversion; + use_conversion_ = use_conversion; } private: /** If true, the proxy will convert input and output data to/from the proxy socket types. */ - bool m_use_conversion; + bool use_conversion_; }; class SocketBufferNode : public Node { -- cgit v1.2.3