[Bf-blender-cvs] [6873f47edea] master: Cleanup: GCC ignored qualifier warning

Campbell Barton noreply at git.blender.org
Wed Sep 12 23:34:10 CEST 2018


Commit: 6873f47edea909061389b3d9037f8cdfed9b9231
Author: Campbell Barton
Date:   Thu Sep 13 07:39:22 2018 +1000
Branches: master
https://developer.blender.org/rB6873f47edea909061389b3d9037f8cdfed9b9231

Cleanup: GCC ignored qualifier warning

===================================================================

M	source/blender/compositor/intern/COM_CompositorContext.cpp
M	source/blender/compositor/intern/COM_CompositorContext.h
M	source/blender/compositor/intern/COM_ExecutionGroup.h
M	source/blender/compositor/intern/COM_MemoryBuffer.h
M	source/blender/compositor/intern/COM_Node.h
M	source/blender/compositor/intern/COM_NodeOperation.h
M	source/blender/compositor/intern/COM_SocketReader.h
M	source/blender/compositor/operations/COM_CompositorOperation.h
M	source/blender/compositor/operations/COM_OutputFileOperation.h
M	source/blender/compositor/operations/COM_PreviewOperation.cpp
M	source/blender/compositor/operations/COM_PreviewOperation.h
M	source/blender/compositor/operations/COM_ReadBufferOperation.h
M	source/blender/compositor/operations/COM_SetColorOperation.h
M	source/blender/compositor/operations/COM_SetValueOperation.h
M	source/blender/compositor/operations/COM_SetVectorOperation.h
M	source/blender/compositor/operations/COM_ViewerOperation.cpp
M	source/blender/compositor/operations/COM_ViewerOperation.h
M	source/blender/compositor/operations/COM_WriteBufferOperation.h

===================================================================

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")
diff --git a/source/blender/compositor/operations/COM_CompositorOperation.h b/source/blender/compositor/operations/COM_CompositorOperation.h
index 2645c69579d..1a3553d14b4 100644
--- a/source/blender/compositor/operations/COM_CompositorOperation.h
+++ b/source/blender/compositor/operations/COM_CompositorOperation.h
@@ -85,7 +85,7 @@ private:
 	const char *m_viewName;
 public:
 	CompositorOperation();
-	const bool isActiveCompositorOutput() const { return this->m_active; }
+	bool isActiveCompositorOutput() const { return this->m_active; }
 	void executeRegion(rcti *rect, unsigned int tileNumber);
 	void setScene(const struct Scene *scene) { m_scene = scene; }
 	void setSceneName(const char *sceneName) { BLI_strncpy(this->m_sceneName, sceneName, sizeof(this->m_sceneName)); }
@@ -94,7 +94,7 @@ public:
 	bool isOutputOperation(bool /*rendering*/) const { return this->isActiveCompositorOutput(); }
 	void initExecution();
 	void deinitExecution();
-	const CompositorPriority getRenderPriority() const { return COM_PRIORITY_MEDIUM; }
+	CompositorPriority getRenderPriority() const { return COM_PRIORITY_MEDIUM; }
 	void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
 	void setUseAlphaInput(bool value) { this->m_useAlphaInput = value; }
 	void setActive(bool active) { this->m_active = active; }
diff --git a/source/blender/compositor/operations/COM_OutputFileOperation.h b/source/blender/compositor/operations/COM_OutputFileOperation.h
index cc800ca222a..d230eefdd78 100644
--- a/source/blender/compositor/operations/COM_OutputFileOperation.h
+++ b/source/blender/compositor/operations/COM_OutputFileOperation.h
@@ -57,7 +57,7 @@ public:
 	bool isOutputOperation(bool /*rendering*/) const { return true; }
 	void initExecution();
 	void deinitExecution();
-	const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
+	CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
 
 	bool isFileOutputOperation() const { return true; }
 };
@@ -99,7 +99,7 @@ public:
 	bool isOutputOperation(bool /*rendering*/) const { return true; }
 	void initExecution();
 	void deinitExecution();
-	const CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
+	CompositorPriority getRenderPriority() const { return COM_PRIORITY_LOW; }
 
 	bool isFileOutputOperation() const { return true; }
 };
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.cpp b/source/blender/compositor/operations/COM_PreviewOperation.cpp
index 90e1bba3cd9..91f3dc4e643 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.cpp
+++ b/source/blender/compositor/operations/COM_PreviewOperation.cpp
@@ -142,7 +142,7 @@ void PreviewOperation::determineResolution(unsigned int resolution[2], unsigned
 	resolution[1] = height;
 }
 
-const CompositorPriority PreviewOperation::getRenderPriority() const
+CompositorPriority PreviewOperation::getRenderPriority() const
 {
 	return COM_PRIORITY_LOW;
 }
diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h
index cf447dd8e99..350ecd5e314 100644
--- a/source/blender/compositor/operations/COM_PreviewOperation.h
+++ b/source/blender/compositor/operations/COM_PreviewOperation.h
@@ -48,7 +48,7 @@ public:
 	bool isOutputOperation(bool /*rendering*/) const { return !G.background; }
 	void initExecution();
 	void deinitExecution();
-	const CompositorPriority getRenderPriority() const;
+	CompositorPriority getRenderPriority() const;
 
 	void executeRegion(rcti *rect, unsigned int tileNumber);
 	void determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2]);
diff --git a/source/blender/compositor/operations/COM_ReadBufferOperation.h b/source/blender/compositor/operations/COM_ReadBufferOperation.h
index c73acbaf300..4aa6eb7d492 100644
--- a/source/blender/compositor/operati

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list