Cleanup: GCC ignored qualifier warning
authorCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 21:39:22 +0000 (07:39 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 12 Sep 2018 21:42:38 +0000 (07:42 +1000)
18 files changed:
source/blender/compositor/intern/COM_CompositorContext.cpp
source/blender/compositor/intern/COM_CompositorContext.h
source/blender/compositor/intern/COM_ExecutionGroup.h
source/blender/compositor/intern/COM_MemoryBuffer.h
source/blender/compositor/intern/COM_Node.h
source/blender/compositor/intern/COM_NodeOperation.h
source/blender/compositor/intern/COM_SocketReader.h
source/blender/compositor/operations/COM_CompositorOperation.h
source/blender/compositor/operations/COM_OutputFileOperation.h
source/blender/compositor/operations/COM_PreviewOperation.cpp
source/blender/compositor/operations/COM_PreviewOperation.h
source/blender/compositor/operations/COM_ReadBufferOperation.h
source/blender/compositor/operations/COM_SetColorOperation.h
source/blender/compositor/operations/COM_SetValueOperation.h
source/blender/compositor/operations/COM_SetVectorOperation.h
source/blender/compositor/operations/COM_ViewerOperation.cpp
source/blender/compositor/operations/COM_ViewerOperation.h
source/blender/compositor/operations/COM_WriteBufferOperation.h

index 5d6497f147feef127f698caa920fac6654e3d3ec..8574a9ee6f0bd3988012f44c0b9bc4b10cf123d9 100644 (file)
@@ -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;
index e7889b11f5b2cae2effbac594965325497fdbf8e..6b153ff0161b62873be7dc5d6ca7e8998c7c441b 100644 (file)
@@ -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?
index da57c89a89465e2ee19f2b4ae0e5184fb7c7cb67..2c79b2ba0a40bd8051d0510acff8d3006d2d26cd 100644 (file)
@@ -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
index e8c71d0fd554e7548eca7cfeea23f7e280e4260c..7492113da34c7d4bc3afd556eaf6fd1ee72a06c8 100644 (file)
@@ -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
index f57568350c095bb742a09400c5dcaf33d62f277b..891845517d591035d4b5089805f36fe3f84b22b3 100644 (file)
@@ -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
index e5c27be5c5b02e6dcbb205865090eaa7c676222f..95164d727e8f97159caa1504f74f06684439fc0a 100644 (file)
@@ -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
index 170b9e1bd35c13b9ca854e3e8edec6c2df3bedff..c8a8e1d3252c950fd6c0dc0235db434501f87779 100644 (file)
@@ -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")
index 2645c69579de91178a66ccd8bef0f48cc79521e0..1a3553d14b4b10503ae2cfe0ac155908df162baa 100644 (file)
@@ -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; }
index cc800ca222a50210dfb850783a63269f59e876e1..d230eefdd78984cddf061b9717cd8a248043698d 100644 (file)
@@ -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; }
 };
index 90e1bba3cd913f8711594bfed9c775816bd1e5a5..91f3dc4e64349bdea5e94b777a81e081f89d5fc6 100644 (file)
@@ -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;
 }
index cf447dd8e992ac19198010ff9d6abcdf34572b69..350ecd5e31479b4b5b2e4d6d959d960a0942499b 100644 (file)
@@ -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]);
index c73acbaf300f82532340dc3a57b1f8fe194033b1..4aa6eb7d492ac5c00d5748b68ae1a2f98a47c1ae 100644 (file)
@@ -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);
index 9a509f6fb0cad9b0cbd22e7c2e8a2ecb01fa85cb..a3bd2e307490d02f3fd9b4c1538d9abcdae4d2fe 100644 (file)
@@ -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])
        {
index 4e274816f27da0592d44c1bea0046d7608edd4a6..0dc7a4cd1391a480952d3c383ee54f4aa5d0bb36 100644 (file)
@@ -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; }
 
 
index ca35784ff9ac3147c2b8b2bcc1e7ea205372ec7b..98f5d918ec205518ebacda9ed35e39047f00ebdc 100644 (file)
@@ -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; }
 
        /**
index 51fd5d4dc76cb716da85c5a5a3456ab615cda2d7..25167eeab9f178b7a155e411e3c9a0c04f6d0a2c 100644 (file)
@@ -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;
index 43e305fb2917551f370b337c06cecf6f3cc19072..1eb3a1ad602aaf090c3c62321d370ff1eee31966 100644 (file)
@@ -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; }
index 639d1ba1d981eaff062b20559f1e4e15b2d82411..79e228c63fb40e8b5e294b9cdbba0fd1439b520b 100644 (file)
@@ -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);