Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-09-13 00:39:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-09-13 00:42:38 +0300
commit6873f47edea909061389b3d9037f8cdfed9b9231 (patch)
tree58ed4261ce3a628d61d07dc386e6799c882fb5f0 /source/blender/compositor/intern
parent2ab1063616b9cab3ef74fd7f38ffa08cfb77f5d0 (diff)
Cleanup: GCC ignored qualifier warning
Diffstat (limited to 'source/blender/compositor/intern')
-rw-r--r--source/blender/compositor/intern/COM_CompositorContext.cpp2
-rw-r--r--source/blender/compositor/intern/COM_CompositorContext.h6
-rw-r--r--source/blender/compositor/intern/COM_ExecutionGroup.h2
-rw-r--r--source/blender/compositor/intern/COM_MemoryBuffer.h2
-rw-r--r--source/blender/compositor/intern/COM_Node.h4
-rw-r--r--source/blender/compositor/intern/COM_NodeOperation.h10
-rw-r--r--source/blender/compositor/intern/COM_SocketReader.h4
7 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/compositor/intern/COM_CompositorContext.cpp b/source/blender/compositor/intern/COM_CompositorContext.cpp
index 5d6497f147f..8574a9ee6f0 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.cpp
+++ b/source/blender/compositor/intern/COM_CompositorContext.cpp
@@ -35,7 +35,7 @@ CompositorContext::CompositorContext()
this->m_displaySettings = NULL;
}
-const int CompositorContext::getFramenumber() const
+int CompositorContext::getFramenumber() const
{
if (this->m_rd) {
return this->m_rd->cfra;
diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h
index e7889b11f5b..6b153ff0161 100644
--- a/source/blender/compositor/intern/COM_CompositorContext.h
+++ b/source/blender/compositor/intern/COM_CompositorContext.h
@@ -168,17 +168,17 @@ public:
/**
* \brief get the quality
*/
- const CompositorQuality getQuality() const { return this->m_quality; }
+ CompositorQuality getQuality() const { return this->m_quality; }
/**
* \brief get the current framenumber of the scene in this context
*/
- const int getFramenumber() const;
+ int getFramenumber() const;
/**
* \brief has this system active openclDevices?
*/
- const bool getHasActiveOpenCLDevices() const { return this->m_hasActiveOpenCLDevices; }
+ bool getHasActiveOpenCLDevices() const { return this->m_hasActiveOpenCLDevices; }
/**
* \brief set has this system active openclDevices?
diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h
index da57c89a894..2c79b2ba0a4 100644
--- a/source/blender/compositor/intern/COM_ExecutionGroup.h
+++ b/source/blender/compositor/intern/COM_ExecutionGroup.h
@@ -268,7 +268,7 @@ public:
* \note ViewerOperation, CompositeOperation, PreviewOperation.
* \see NodeOperation.isOutputOperation
*/
- const int isOutputExecutionGroup() const { return this->m_isOutput; }
+ int isOutputExecutionGroup() const { return this->m_isOutput; }
/**
* \brief set whether this ExecutionGroup is an output
diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h
index e8c71d0fd55..7492113da34 100644
--- a/source/blender/compositor/intern/COM_MemoryBuffer.h
+++ b/source/blender/compositor/intern/COM_MemoryBuffer.h
@@ -275,7 +275,7 @@ public:
/**
* \brief is this MemoryBuffer a temporarily buffer (based on an area, not on a chunk)
*/
- inline const bool isTemporarily() const { return this->m_state == COM_MB_TEMPORARILY; }
+ inline bool isTemporarily() const { return this->m_state == COM_MB_TEMPORARILY; }
/**
* \brief add the content from otherBuffer to this MemoryBuffer
diff --git a/source/blender/compositor/intern/COM_Node.h b/source/blender/compositor/intern/COM_Node.h
index f57568350c0..891845517d5 100644
--- a/source/blender/compositor/intern/COM_Node.h
+++ b/source/blender/compositor/intern/COM_Node.h
@@ -118,12 +118,12 @@ public:
/**
* \brief Return the number of input sockets of this node.
*/
- const unsigned int getNumberOfInputSockets() const { return this->m_inputsockets.size(); }
+ unsigned int getNumberOfInputSockets() const { return this->m_inputsockets.size(); }
/**
* \brief Return the number of output sockets of this node.
*/
- const unsigned int getNumberOfOutputSockets() const { return this->m_outputsockets.size(); }
+ unsigned int getNumberOfOutputSockets() const { return this->m_outputsockets.size(); }
/**
* get the reference to a certain outputsocket
diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h
index e5c27be5c5b..95164d727e8 100644
--- a/source/blender/compositor/intern/COM_NodeOperation.h
+++ b/source/blender/compositor/intern/COM_NodeOperation.h
@@ -241,7 +241,7 @@ public:
* Complex operations are typically doing many reads to calculate the output of a single pixel.
* Mostly Filter types (Blurs, Convolution, Defocus etc) need this to be set to true.
*/
- const bool isComplex() const { return this->m_complex; }
+ bool isComplex() const { return this->m_complex; }
virtual bool isSetOperation() const { return false; }
@@ -250,14 +250,14 @@ public:
* \return [true:false]
* \see ReadBufferOperation
*/
- virtual const bool isReadBufferOperation() const { return false; }
+ virtual bool isReadBufferOperation() const { return false; }
/**
* \brief is this operation of type WriteBufferOperation
* \return [true:false]
* \see WriteBufferOperation
*/
- virtual const bool isWriteBufferOperation() const { return false; }
+ virtual bool isWriteBufferOperation() const { return false; }
/**
* \brief is this operation the active viewer output
@@ -265,7 +265,7 @@ public:
* \return [true:false]
* \see BaseViewerOperation
*/
- virtual const bool isActiveViewerOutput() const { return false; }
+ virtual bool isActiveViewerOutput() const { return false; }
virtual bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
@@ -280,7 +280,7 @@ public:
* \note only applicable for output operations like ViewerOperation
* \return CompositorPriority
*/
- virtual const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
+ virtual CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
/**
* \brief can this NodeOperation be scheduled on an OpenCLDevice
diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h
index 170b9e1bd35..c8a8e1d3252 100644
--- a/source/blender/compositor/intern/COM_SocketReader.h
+++ b/source/blender/compositor/intern/COM_SocketReader.h
@@ -113,8 +113,8 @@ public:
virtual MemoryBuffer *getInputMemoryBuffer(MemoryBuffer ** /*memoryBuffers*/) { return 0; }
- inline const unsigned int getWidth() const { return this->m_width; }
- inline const unsigned int getHeight() const { return this->m_height; }
+ inline unsigned int getWidth() const { return this->m_width; }
+ inline unsigned int getHeight() const { return this->m_height; }
#ifdef WITH_CXX_GUARDEDALLOC
MEM_CXX_CLASS_ALLOC_FUNCS("COM:SocketReader")