cleanups suggested by clang-tidy

Author: Lars H. Rohweder

platform/unix/syspovfilesystem.cpp

@@ -121,7 +121,7 @@ std::size_t LargeFile::Read(void* data, std::size_t maxSize)
 {
     if (mpData->handle == -1)
         return false;
-    return read(mpData->handle, data, int(maxSize));
+    return read(mpData->handle, data, maxSize);
 }
 
 bool LargeFile::Write(const void* data, std::size_t size)

source/backend/bounding/boundingtask.cpp

@@ -93,10 +93,7 @@ class SceneObjects final : public BSPTree::Objects
             }
         }
 
-        virtual ~SceneObjects() override
-        {
-            // nothing to do
-        }
+        ~SceneObjects() override = default;
 
         virtual unsigned int size() const override
         {
@@ -156,10 +153,6 @@ BoundingTask::BoundingTask(std::shared_ptr<BackendSceneData> sd, unsigned int bt
 {
 }
 
-BoundingTask::~BoundingTask()
-{
-}
-
 void BoundingTask::AppendObject(ObjectPtr p)
 {
     sceneData->objects.push_back(p);

source/backend/bounding/boundingtask.h

@@ -37,7 +37,7 @@
 #define POVRAY_BACKEND_BOUNDINGTASK_H
 
 // Module config header file must be the first file included within POV-Ray unit header files
-#include "backend/configbackend.h"
+//#include "backend/configbackend.h"
 
 // C++ variants of C standard header files
 //  (none at the moment)
@@ -62,11 +62,11 @@ class BoundingTask final : public SceneTask
 {
     public:
         BoundingTask(std::shared_ptr<BackendSceneData> sd, unsigned int bt, size_t seed);
-        virtual ~BoundingTask() override;
+        ~BoundingTask() override = default;
 
-        virtual void Run() override;
-        virtual void Stopped() override;
-        virtual void Finish() override;
+        void Run() override;
+        void Stopped() override;
+        void Finish() override;
 
         void AppendObject(ObjectPtr p);
 

source/backend/scene/view.h

@@ -120,7 +120,7 @@ class ViewData final
         class BlockInfo
         {
             public:
-                virtual ~BlockInfo() {}
+            virtual ~BlockInfo() =default;
         };
 
         /**
@@ -253,7 +253,7 @@ class ViewData final
          *  Get the highest trace level found when last rendering this view.
          *  @return                 Highest trace level found so far.
          */
-        unsigned int GetHighestTraceLevel();
+        //unsigned int GetHighestTraceLevel();
 
         /**
          *  Set the highest trace level found while rendering this view.

source/base/colour.h

@@ -41,6 +41,7 @@
 #include "base/configbase.h"
 
 // C++ variants of C standard header files
+#include <array>
 #include <cmath>
 
 // C++ standard header files
@@ -133,57 +134,39 @@ class GenericRGBColour final
 
         friend GenericRGBColour ToRGBColour(const GenericColour<T>& col);
 
-        /// Default constructor.
-        inline GenericRGBColour()
-        {
-            mColour[RED]   = 0.0;
-            mColour[GREEN] = 0.0;
-            mColour[BLUE]  = 0.0;
-        }
+        GenericRGBColour()
+        : mColour{ T(), T(), T() }
+        {}
 
         /// Copy constructor.
-        inline GenericRGBColour(const GenericRGBColour& col)
-        {
-            mColour[RED]   = col.mColour[RED];
-            mColour[GREEN] = col.mColour[GREEN];
-            mColour[BLUE]  = col.mColour[BLUE];
-        }
+        GenericRGBColour(const GenericRGBColour& col) = default;
 
         template<typename T2>
         inline explicit GenericRGBColour(const GenericRGBColour<T2>& col)
-        {
-            mColour[RED]   = col.mColour[RED];
-            mColour[GREEN] = col.mColour[GREEN];
-            mColour[BLUE]  = col.mColour[BLUE];
-        }
+        : mColour{ T(col.mColour[RED]), T(col.mColour[GREEN]), T(col.mColour[BLUE])}
+        {}
 
-        inline explicit GenericRGBColour(T grey)
-        {
-            mColour[RED]   = grey;
-            mColour[GREEN] = grey;
-            mColour[BLUE]  = grey;
-        }
+        explicit GenericRGBColour(T grey)
+        : mColour{grey, grey, grey}
+        {}
 
-        inline explicit GenericRGBColour(T red, T green, T blue)
-        {
-            mColour[RED]   = red;
-            mColour[GREEN] = green;
-            mColour[BLUE]  = blue;
-        }
+        explicit GenericRGBColour(T red, T green, T blue)
+        : mColour{ red, green, blue }
+        {}
 
-        inline explicit GenericRGBColour(const GenericRGBFTColour<T>& col)
+        explicit GenericRGBColour(const GenericRGBFTColour<T>& col)
         {
             mColour[RED]   = col.red();
             mColour[GREEN] = col.green();
             mColour[BLUE]  = col.blue();
         }
 
         template<int BIAS, bool QUANTIZE_TO_NEAREST, typename T2>
-        inline explicit GenericRGBColour(const GenericRGBEColour<BIAS,QUANTIZE_TO_NEAREST,T2>& col)
+        explicit GenericRGBColour(const GenericRGBEColour<BIAS,QUANTIZE_TO_NEAREST,T2>& col)
         {
             if (col.mData[GenericRGBEColour<BIAS,QUANTIZE_TO_NEAREST,T2>::EXP] > std::numeric_limits<T2>::min())
             {
-                double expFactor = ldexp(1.0,(int)col.mData[GenericRGBEColour<BIAS,QUANTIZE_TO_NEAREST,T2>::EXP]-(int)(BIAS+8));
+                double expFactor = ldexp(1.0,(int)col.mData[GenericRGBEColour<BIAS,QUANTIZE_TO_NEAREST,T2>::EXP]-(BIAS+8));
                 double quantizationFix = (QUANTIZE_TO_NEAREST? 0.0 : 0.5);
                 mColour[RED]   = (col.mData[GenericRGBEColour<BIAS,QUANTIZE_TO_NEAREST,T2>::RED]   + quantizationFix) * expFactor;
                 mColour[GREEN] = (col.mData[GenericRGBEColour<BIAS,QUANTIZE_TO_NEAREST,T2>::GREEN] + quantizationFix) * expFactor;
@@ -204,13 +187,7 @@ class GenericRGBColour final
             mColour[BLUE]  = col.Blue();
         }
 */
-        inline GenericRGBColour& operator=(const GenericRGBColour& col)
-        {
-            mColour[RED]   = col.mColour[RED];
-            mColour[GREEN] = col.mColour[GREEN];
-            mColour[BLUE]  = col.mColour[BLUE];
-            return *this;
-        }
+        GenericRGBColour& operator=(const GenericRGBColour& col) = default;
 
         inline T  operator[](int idx) const { return mColour[idx]; }
         inline T& operator[](int idx)       { return mColour[idx]; }
@@ -576,15 +553,12 @@ class GenericRGBColour final
             BLUE   = 2
         };
 
-        T mColour[3];
+        std::array<T,3> mColour;
 
 #if (NUM_COLOUR_CHANNELS == 3)
         inline explicit GenericRGBColour(const GenericColour<T>& col)
-        {
-            mColour[RED]   = col.mColour[0];
-            mColour[GREEN] = col.mColour[1];
-            mColour[BLUE]  = col.mColour[2];
-        }
+        : mColour(col.mColour)
+        {}
 #else
         #error "TODO!"
 #endif
@@ -690,11 +664,7 @@ class GenericRGBFTColour final
         {}
 
         /// Copy constructor.
-        inline GenericRGBFTColour(const GenericRGBFTColour& col) :
-            mColour(col.mColour),
-            mFilter(col.mFilter),
-            mTransm(col.mTransm)
-        {}
+        inline GenericRGBFTColour(const GenericRGBFTColour& col) = default;
 
         template<typename T2>
         inline explicit GenericRGBFTColour(const GenericRGBFTColour<T2>& col) :
@@ -733,13 +703,7 @@ class GenericRGBFTColour final
             mTransm(expr[4])
         {}
 
-        inline GenericRGBFTColour& operator=(const GenericRGBFTColour& col)
-        {
-            mColour = col.mColour;
-            mFilter = col.mFilter;
-            mTransm = col.mTransm;
-            return *this;
-        }
+        inline GenericRGBFTColour& operator=(const GenericRGBFTColour& col) = default;
 
         inline GenericRGBColour<T>  rgb() const { return mColour; }
         inline GenericRGBColour<T>& rgb()       { return mColour; }
@@ -1008,10 +972,7 @@ class GenericRGBTColour final
         {}
 
         /// Copy constructor.
-        inline GenericRGBTColour(const GenericRGBTColour& col) :
-            mColour(col.mColour),
-            mTransm(col.mTransm)
-        {}
+        inline GenericRGBTColour(const GenericRGBTColour& col) = default;
 
         template<typename T2>
         inline explicit GenericRGBTColour(const GenericRGBTColour<T2>& col) :
@@ -1035,13 +996,7 @@ class GenericRGBTColour final
             mTransm(col.transm())
         {}
 */
-
-        inline GenericRGBTColour& operator=(const GenericRGBTColour& col)
-        {
-            mColour = col.mColour;
-            mTransm = col.mTransm;
-            return *this;
-        }
+        inline GenericRGBTColour& operator=(const GenericRGBTColour& col) = default;
 
         inline GenericRGBColour<T>  rgb() const { return mColour; }
         inline GenericRGBColour<T>& rgb()       { return mColour; }
@@ -1261,18 +1216,16 @@ class GenericColour final
 
         /// Default constructor.
         inline GenericColour()
-        {
-            for (int i = 0; i < channels; i ++)
-                mColour[i] = 0.0;
-        }
+        : mColour{}
+        {}
 
         /// Copy constructor.
-        inline GenericColour(const GenericColour& col)
-        {
+        inline GenericColour(const GenericColour& col) = default;
+/*        {
             for (int i = 0; i < channels; i ++)
                 mColour[i] = col.mColour[i];
         }
-
+*/
         template<typename T2>
         inline explicit GenericColour(const GenericColour<T2>& col)
         {
@@ -1301,13 +1254,13 @@ class GenericColour final
                 mColour[i] = (col.mData[i] + 0.5) * exponent;
         }
 */
-        inline GenericColour& operator=(const GenericColour& col)
-        {
+        inline GenericColour& operator=(const GenericColour& col) = default;
+/*        {
             for (int i = 0; i < channels; i ++)
                 mColour[i] = col.mColour[i];
             return *this;
         }
-
+*/
         inline T  operator[](int idx) const { return mColour[idx]; }
         inline T& operator[](int idx)       { return mColour[idx]; }
 
@@ -1740,7 +1693,7 @@ class GenericColour final
 
 #endif
 
-        T mColour[channels];
+        std::array<T,channels> mColour;
 
 #if (NUM_COLOUR_CHANNELS == 3)
         inline explicit GenericColour(const GenericRGBColour<T>& col)

unix/disp.h

@@ -54,11 +54,11 @@ namespace pov_frontend
         public:
             UnixDisplay(unsigned int w, unsigned int h, vfeSession *session, bool visible) :
                 vfeDisplay(w, h, session, visible) {};
-            virtual ~UnixDisplay() override {} ;
-            virtual void Initialise() override = 0;
-            virtual void Close() override = 0;
-            virtual void Show() override = 0;
-            virtual void Hide() override = 0;
+            ~UnixDisplay() override =default ;
+            void Initialise() override = 0;
+            void Close() override = 0;
+            void Show() override = 0;
+            void Hide() override = 0;
 
             virtual bool TakeOver(UnixDisplay *display) = 0;
 

vfe/vfe.cpp

@@ -178,10 +178,6 @@ vfeConsole::vfeConsole(vfeSession *session, int width) : Console(width == -1 ? s
   Initialise();
 }
 
-vfeConsole::~vfeConsole()
-{
-}
-
 void vfeConsole::Initialise()
 {
   rawBuffer [0] = '\0' ;
@@ -243,10 +239,6 @@ vfePlatformBase::vfePlatformBase(vfeSession& session) : m_Session(&session), Pla
 {
 }
 
-vfePlatformBase::~vfePlatformBase()
-{
-}
-
 UCS2String vfePlatformBase::GetTemporaryPath(void)
 {
   return m_Session->GetTemporaryPath();
@@ -291,9 +283,6 @@ vfeParserMessageHandler::vfeParserMessageHandler() : ParserMessageHandler()
   m_Session = vfeSession::GetSessionFromThreadID();
 }
 
-vfeParserMessageHandler::~vfeParserMessageHandler()
-{
-}
 
 void vfeParserMessageHandler::Options(Console *Con, POVMS_Object& Obj, bool conout)
 {
@@ -426,11 +415,7 @@ void vfeParserMessageHandler::DebugInfo(Console *Con, POVMS_Object& Obj, bool co
 ////////////////////////////////////////////////////////////////////////////////////////
 
 vfeRenderMessageHandler::vfeRenderMessageHandler() : RenderMessageHandler()
-{
-  m_Session = vfeSession::GetSessionFromThreadID();
-}
-
-vfeRenderMessageHandler::~vfeRenderMessageHandler()
+,  m_Session {vfeSession::GetSessionFromThreadID()}
 {
 }
 
@@ -518,10 +503,6 @@ vfeProcessRenderOptions::vfeProcessRenderOptions(vfeSession *Session) : ProcessR
 {
 }
 
-vfeProcessRenderOptions::~vfeProcessRenderOptions()
-{
-}
-
 int vfeProcessRenderOptions::ReadSpecialOptionHandler(INI_Parser_Table *Table, char *Param, POVMSObjectPtr Obj)
 {
   return ProcessRenderOptions::ReadSpecialOptionHandler (Table, Param, Obj);