From 6873f47edea909061389b3d9037f8cdfed9b9231 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 13 Sep 2018 07:39:22 +1000 Subject: Cleanup: GCC ignored qualifier warning --- source/blender/compositor/operations/COM_CompositorOperation.h | 4 ++-- source/blender/compositor/operations/COM_OutputFileOperation.h | 4 ++-- source/blender/compositor/operations/COM_PreviewOperation.cpp | 2 +- source/blender/compositor/operations/COM_PreviewOperation.h | 2 +- source/blender/compositor/operations/COM_ReadBufferOperation.h | 2 +- source/blender/compositor/operations/COM_SetColorOperation.h | 8 ++++---- source/blender/compositor/operations/COM_SetValueOperation.h | 2 +- source/blender/compositor/operations/COM_SetVectorOperation.h | 8 ++++---- source/blender/compositor/operations/COM_ViewerOperation.cpp | 2 +- source/blender/compositor/operations/COM_ViewerOperation.h | 4 ++-- source/blender/compositor/operations/COM_WriteBufferOperation.h | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) (limited to 'source/blender/compositor/operations') 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/operations/COM_ReadBufferOperation.h +++ b/source/blender/compositor/operations/COM_ReadBufferOperation.h @@ -44,7 +44,7 @@ public: void executePixelExtend(float output[4], float x, float y, PixelSampler sampler, MemoryBufferExtend extend_x, MemoryBufferExtend extend_y); void executePixelFiltered(float output[4], float x, float y, float dx[2], float dy[2]); - const bool isReadBufferOperation() const { return true; } + bool isReadBufferOperation() const { return true; } void setOffset(unsigned int offset) { this->m_offset = offset; } unsigned int getOffset() const { return this->m_offset; } bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output); diff --git a/source/blender/compositor/operations/COM_SetColorOperation.h b/source/blender/compositor/operations/COM_SetColorOperation.h index 9a509f6fb0c..a3bd2e30749 100644 --- a/source/blender/compositor/operations/COM_SetColorOperation.h +++ b/source/blender/compositor/operations/COM_SetColorOperation.h @@ -39,13 +39,13 @@ public: */ SetColorOperation(); - const float getChannel1() { return this->m_color[0]; } + float getChannel1() { return this->m_color[0]; } void setChannel1(float value) { this->m_color[0] = value; } - const float getChannel2() { return this->m_color[1]; } + float getChannel2() { return this->m_color[1]; } void setChannel2(float value) { this->m_color[1] = value; } - const float getChannel3() { return this->m_color[2]; } + float getChannel3() { return this->m_color[2]; } void setChannel3(float value) { this->m_color[2] = value; } - const float getChannel4() { return this->m_color[3]; } + float getChannel4() { return this->m_color[3]; } void setChannel4(const float value) { this->m_color[3] = value; } void setChannels(const float value[4]) { diff --git a/source/blender/compositor/operations/COM_SetValueOperation.h b/source/blender/compositor/operations/COM_SetValueOperation.h index 4e274816f27..0dc7a4cd139 100644 --- a/source/blender/compositor/operations/COM_SetValueOperation.h +++ b/source/blender/compositor/operations/COM_SetValueOperation.h @@ -39,7 +39,7 @@ public: */ SetValueOperation(); - const float getValue() { return this->m_value; } + float getValue() { return this->m_value; } void setValue(float value) { this->m_value = value; } diff --git a/source/blender/compositor/operations/COM_SetVectorOperation.h b/source/blender/compositor/operations/COM_SetVectorOperation.h index ca35784ff9a..98f5d918ec2 100644 --- a/source/blender/compositor/operations/COM_SetVectorOperation.h +++ b/source/blender/compositor/operations/COM_SetVectorOperation.h @@ -42,13 +42,13 @@ public: */ SetVectorOperation(); - const float getX() { return this->m_x; } + float getX() { return this->m_x; } void setX(float value) { this->m_x = value; } - const float getY() { return this->m_y; } + float getY() { return this->m_y; } void setY(float value) { this->m_y = value; } - const float getZ() { return this->m_z; } + float getZ() { return this->m_z; } void setZ(float value) { this->m_z = value; } - const float getW() { return this->m_w; } + float getW() { return this->m_w; } void setW(float value) { this->m_w = value; } /** diff --git a/source/blender/compositor/operations/COM_ViewerOperation.cpp b/source/blender/compositor/operations/COM_ViewerOperation.cpp index 51fd5d4dc76..25167eeab9f 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.cpp +++ b/source/blender/compositor/operations/COM_ViewerOperation.cpp @@ -188,7 +188,7 @@ void ViewerOperation::updateImage(rcti *rect) this->updateDraw(); } -const CompositorPriority ViewerOperation::getRenderPriority() const +CompositorPriority ViewerOperation::getRenderPriority() const { if (this->isActiveViewerOutput()) { return COM_PRIORITY_HIGH; diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 43e305fb291..1eb3a1ad602 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -58,7 +58,7 @@ public: bool isOutputOperation(bool /*rendering*/) const { if (G.background) return false; return isActiveViewerOutput(); } void setImage(Image *image) { this->m_image = image; } void setImageUser(ImageUser *imageUser) { this->m_imageUser = imageUser; } - const bool isActiveViewerOutput() const { return this->m_active; } + bool isActiveViewerOutput() const { return this->m_active; } void setActive(bool active) { this->m_active = active; } void setCenterX(float centerX) { this->m_centerX = centerX;} void setCenterY(float centerY) { this->m_centerY = centerY;} @@ -66,7 +66,7 @@ public: float getCenterX() const { return this->m_centerX; } float getCenterY() const { return this->m_centerY; } OrderOfChunks getChunkOrder() const { return this->m_chunkOrder; } - const CompositorPriority getRenderPriority() const; + CompositorPriority getRenderPriority() const; bool isViewerOperation() const { return true; } void setUseAlphaInput(bool value) { this->m_useAlphaInput = value; } void setRenderData(const RenderData *rd) { this->m_rd = rd; } diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.h b/source/blender/compositor/operations/COM_WriteBufferOperation.h index 639d1ba1d98..79e228c63fb 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.h +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.h @@ -39,7 +39,7 @@ public: ~WriteBufferOperation(); MemoryProxy *getMemoryProxy() { return this->m_memoryProxy; } void executePixelSampled(float output[4], float x, float y, PixelSampler sampler); - const bool isWriteBufferOperation() const { return true; } + bool isWriteBufferOperation() const { return true; } bool isSingleValue() const { return m_single_value; } void executeRegion(rcti *rect, unsigned int tileNumber); -- cgit v1.2.3