small fixes based on sonar qube analysis (#82)

fernandotonon · Jul 3, 2024 · 0ff73b4 · 0ff73b4
1 parent 52177cb
commit 0ff73b4
Show file tree

Hide file tree

Showing 29 changed files with 49 additions and 79 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -12,7 +12,7 @@ cmake_minimum_required(VERSION 3.24.0)
 cmake_policy(SET CMP0005 NEW)
 cmake_policy(SET CMP0048 NEW) # manages project version
 
-project(QtMeshEditor VERSION 1.9.2 LANGUAGES CXX)
+project(QtMeshEditor VERSION 1.9.4 LANGUAGES CXX)
 message(STATUS "Building QtMeshEditor version ${PROJECT_VERSION}")
 
 set(QTMESHEDITOR_VERSION_STRING "\"${PROJECT_VERSION}\"")

diff --git a/src/EditorViewport.cpp b/src/EditorViewport.cpp
@@ -42,7 +42,7 @@ THE SOFTWARE.
 
 EditorViewport::EditorViewport(MainWindow* parent, int index)
     :QDockWidget(tr("Viewport ") + QString::number(index)), mIndex(index),
-      m_pOgreWidget(0), m_pMainWindow(parent)
+      m_pOgreWidget(nullptr), m_pMainWindow(parent)
 {
     // Essential behavior of dock widget
     setAllowedAreas( Qt::AllDockWidgetAreas);
@@ -58,7 +58,7 @@ EditorViewport::~EditorViewport()
     if(m_pOgreWidget)
     {
         delete m_pOgreWidget;
-        m_pOgreWidget = 0;
+        m_pOgreWidget = nullptr;
     }
 
     destroy();

diff --git a/src/Manager.cpp b/src/Manager.cpp
@@ -67,7 +67,7 @@ THE SOFTWARE.
 
 ////////////////////////////////////////
 // Static variable initialisation
-Manager* Manager:: m_pSingleton = 0;
+Manager* Manager:: m_pSingleton = nullptr;
 
 QString Manager::mValidFileExtention = ".mesh .dae .blend .3ds .ase .obj .ifc .xgl .zgl .ply .dxf .lwo "\
         ".lws .lxo .stl .x .ac .ms3d .cob .scn .bvh .csm .xml .irrmesh .irr .mdl .md2 .md3 "\
@@ -78,7 +78,7 @@ QString Manager::mValidFileExtention = ".mesh .dae .blend .3ds .ase .obj .ifc .x
 
 Manager* Manager::getSingleton(MainWindow* parent)
 {
-  if (m_pSingleton == 0)
+  if (m_pSingleton == nullptr)
   {
       assert(parent);
       m_pSingleton =  new Manager(parent);
@@ -89,18 +89,18 @@ Manager* Manager::getSingleton(MainWindow* parent)
 
 void Manager::kill()
 {
-    if (m_pSingleton != 0)
+    if (m_pSingleton != nullptr)
     {
         delete m_pSingleton;
-        m_pSingleton = 0;
+        m_pSingleton = nullptr;
     }
 }
 
 ////////////////////////////////////////
 // Constructor & Destructor
 
 Manager::Manager(MainWindow* parent):
-    mRoot(0), mSceneMgr(0), mPlane(0), m_pMainWindow(parent), m_pViewportGrid(0)/*, m_pSelectedNode(0)*/
+    mRoot(nullptr), mSceneMgr(nullptr), mPlane(nullptr), m_pMainWindow(parent), m_pViewportGrid(nullptr)
 {
     initRoot();         // Init Ogre Root
     initRenderSystem(); // Init Ogre Render System
@@ -111,22 +111,22 @@ Manager::~Manager()
     if(m_pViewportGrid)
     {
         delete m_pViewportGrid;
-        m_pViewportGrid = 0;
+        m_pViewportGrid = nullptr;
     }
 
     if (mPlane)
     {
         delete mPlane;
-        mPlane = 0;
+        mPlane = nullptr;
     }
 
     mSceneMgr->clearScene();
     mRoot->destroySceneManager(mSceneMgr);
-    mSceneMgr = 0;
+    mSceneMgr = nullptr;
 
     mRoot->shutdown();
     delete mRoot;
-    mRoot = 0;
+    mRoot = nullptr;
 }
 
 void Manager::CreateEmptyScene()
@@ -150,7 +150,7 @@ void Manager::CreateEmptyScene()
 
 Ogre::SceneNode* Manager::addSceneNode(const QString &_name)
 {
-    Ogre::SceneNode *sn = NULL;
+    Ogre::SceneNode *sn = nullptr;
     unsigned int number = 0;
 
     while(hasSceneNode(QString(_name+(number?QString::number(number):""))))
@@ -165,7 +165,7 @@ Ogre::SceneNode* Manager::addSceneNode(const QString &_name)
 
 Ogre::SceneNode* Manager::addSceneNode(const QString &_name, const Ogre::Any& anything)
 {
-    Ogre::SceneNode *sn = NULL;
+    Ogre::SceneNode *sn = nullptr;
     unsigned int number = 0;
 
     while(hasSceneNode(QString(_name+(number?QString::number(number):""))))
@@ -246,7 +246,7 @@ void Manager::destroyAllAttachedMovableObjects(Ogre::SceneNode* node)
 
 Ogre::SceneNode *Manager::getSceneNode(const QString &_name)
 {
-    return hasSceneNode(_name)?getSceneMgr()->getSceneNode(_name.toStdString().data()):NULL;
+    return hasSceneNode(_name) ? getSceneMgr()->getSceneNode(_name.toStdString().data()) : nullptr;
 }
 
 bool Manager::hasSceneNode(const QString &_name)

diff --git a/src/Manager.h b/src/Manager.h
@@ -60,7 +60,7 @@ class Manager : public QObject
     Q_OBJECT
 
 public:
-    static Manager* getSingleton(MainWindow* parent = 0);
+    static Manager* getSingleton(MainWindow* parent = nullptr);
     static void kill();
 
     Ogre::Root*         getRoot()               const;

diff --git a/src/MaterialComboDelegate.h b/src/MaterialComboDelegate.h
@@ -38,7 +38,7 @@ class MaterialComboDelegate : public QStyledItemDelegate
     Q_OBJECT
 
 public:
-    MaterialComboDelegate(QObject *parent = 0);
+    MaterialComboDelegate(QObject *parent = nullptr);
 
     QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option,
                           const QModelIndex &index) const;

diff --git a/src/MaterialHighlighter.cpp b/src/MaterialHighlighter.cpp
@@ -38,10 +38,6 @@ MaterialHighlighter::MaterialHighlighter(QObject *parent) :
     mParent = parent;
 }
 
-MaterialHighlighter::~MaterialHighlighter()
-{
-}
-
 void MaterialHighlighter::highlightBlock(const QString &text)
 {
     if(mParent) mParent->blockSignals(true);

diff --git a/src/MaterialHighlighter.h b/src/MaterialHighlighter.h
@@ -36,8 +36,8 @@ class MaterialHighlighter : public QSyntaxHighlighter
     Q_OBJECT
 
 public:
-    explicit MaterialHighlighter(QObject *parent = 0);
-    ~MaterialHighlighter();
+    explicit MaterialHighlighter(QObject *parent = nullptr);
+    ~MaterialHighlighter() = default;
 
     void highlightBlock(const QString &text);
 

diff --git a/src/MaterialHighlighter_test.cpp b/src/MaterialHighlighter_test.cpp
@@ -10,7 +10,7 @@ using ::testing::Mock;
 class MockMaterialHighlighter : public MaterialHighlighter
 {
 public:
-    explicit MockMaterialHighlighter(QTextEdit *editor=0){}
+    explicit MockMaterialHighlighter(QTextEdit *editor=nullptr){}
 
     MOCK_METHOD(void, applyHighlight, (const QTextCharFormat &format, const QString &pattern, const QString &text), (override));
 

diff --git a/src/MaterialWidget.cpp b/src/MaterialWidget.cpp
@@ -63,11 +63,6 @@ MaterialWidget::MaterialWidget(QWidget *parent) :
 
 }
 
-MaterialWidget::~MaterialWidget()
-{
-
-}
-
 void MaterialWidget::onNodeSelected()
 {
     blockSignals(true);

diff --git a/src/MaterialWidget.h b/src/MaterialWidget.h
@@ -42,8 +42,8 @@ class MaterialWidget : public QTableWidget
     Q_OBJECT
 
 public:
-    explicit MaterialWidget(QWidget *parent = 0);
-    virtual ~MaterialWidget();
+    explicit MaterialWidget(QWidget *parent = nullptr);
+    virtual ~MaterialWidget() = default;
 
 private:
     void populateTableWithEntities(const QList<Ogre::Entity*>& entities);

diff --git a/src/MeshTransform.cpp b/src/MeshTransform.cpp
@@ -31,10 +31,6 @@ THE SOFTWARE.
 #include "Manager.h"
 #include "SkeletonTransform.h"
 
-MeshTransform::MeshTransform()
-{
-}
-
 void MeshTransform::scaleMesh(const Ogre::Entity *_ent, const Ogre::Vector3 &_scale)
 {
     Ogre::Mesh* mesh = _ent->getMesh().get();

diff --git a/src/MeshTransform.h b/src/MeshTransform.h
@@ -34,7 +34,7 @@ THE SOFTWARE.
 class MeshTransform
 {
 public:
-    MeshTransform();
+    MeshTransform() = delete;
     static void scaleMesh(const Ogre::Entity *_ent, const Ogre::Vector3 &_scale);
     static void scaleMesh(Ogre::Mesh *_mesh, const Ogre::Vector3 &_scale);
     static void translateMesh(const Ogre::Entity *_ent, const Ogre::Vector3 &_translate);

diff --git a/src/ObjectItemModel.cpp b/src/ObjectItemModel.cpp
@@ -43,7 +43,7 @@ THE SOFTWARE.
 // TODO add nicer icons in the tree view
 
 ObjectItemModel::ObjectItemModel(QObject *parent)
-    : QStandardItemModel(parent), m_pRootNode(0),mRootItem(0)
+    : QStandardItemModel(parent), m_pRootNode(nullptr),mRootItem(nullptr)
 {
     reloadSceneNode();
 
@@ -56,7 +56,7 @@ ObjectItemModel::ObjectItemModel(QObject *parent)
 ObjectItemModel::~ObjectItemModel()
 {
     delete mRootItem;
-    m_pRootNode =0;
+    m_pRootNode = nullptr;
 }
 
 const QModelIndex ObjectItemModel::getRootIndex() const

diff --git a/src/ObjectItemModel.h b/src/ObjectItemModel.h
@@ -43,7 +43,7 @@ class ObjectItemModel : public QStandardItemModel
     Q_OBJECT
 
 public:
-    explicit ObjectItemModel(QObject *parent = 0);
+    explicit ObjectItemModel(QObject *parent = nullptr);
     ~ObjectItemModel();
 
 

diff --git a/src/PrimitivesWidget.h b/src/PrimitivesWidget.h
@@ -12,7 +12,7 @@ class PrimitivesWidget : public QWidget,private Ui::PrimitivesWidget
     Q_OBJECT
 
 public:
-    explicit PrimitivesWidget(QWidget *parent = 0);
+    explicit PrimitivesWidget(QWidget *parent = nullptr);
     ~PrimitivesWidget() override = default;
     void updateUiFromParams();
     const QList<PrimitiveObject*>& getSelectedPrimitiveList();

diff --git a/src/QtInputManager.cpp b/src/QtInputManager.cpp
@@ -32,10 +32,6 @@ THE SOFTWARE.
 
 QtInputManager QtInputManager::mInstance;
 
-QtInputManager::QtInputManager()
-{
-}
-
 void QtInputManager::AddKeyListener(QtKeyListener* listener)
 {
     mKeyListeners.append(listener);

diff --git a/src/QtInputManager.h b/src/QtInputManager.h
@@ -51,7 +51,7 @@ class QtInputManager
     void mouseMoveEvent(QMouseEvent *event);
     void wheelEvent(QWheelEvent *event);
 private:
-    QtInputManager();
+    QtInputManager() = default;
     static QtInputManager mInstance;
     QList<QtKeyListener*> mKeyListeners;
     QList<QtMouseListener*> mMouseListeners;

diff --git a/src/RotationGizmo.cpp b/src/RotationGizmo.cpp
@@ -16,7 +16,7 @@ const float RotationGizmo::mSolidThickness = 40.0f;
 // Constructor & destructor
 
 RotationGizmo::RotationGizmo(Ogre::SceneNode* linkNode, const Ogre::String &name, Ogre::Real scale)
-    : m_pXCircle(0), m_pYCircle(0), m_pZCircle(0),mFade(0.4f), mHighlighted(false), mScale(scale)
+    : m_pXCircle(nullptr), m_pYCircle(nullptr), m_pZCircle(nullptr),mFade(0.4f), mHighlighted(false), mScale(scale)
 {
     Ogre::SceneManager* pSceneMgr = linkNode->getCreator();
     //Creating the manual objects

diff --git a/src/SelectionSet.cpp b/src/SelectionSet.cpp
@@ -7,14 +7,14 @@
 
 ////////////////////////////////////////
 // Static variable initialisation
-SelectionSet* SelectionSet:: m_pSingleton = 0;
+SelectionSet* SelectionSet:: m_pSingleton = nullptr;
 
 ////////////////////////////////////////
 /// Static Member to build & destroy
 
 SelectionSet* SelectionSet::getSingleton()
 {
-  if (m_pSingleton == 0)
+  if (m_pSingleton == nullptr)
   {
       m_pSingleton =  new SelectionSet();
   }
@@ -24,10 +24,10 @@ SelectionSet* SelectionSet::getSingleton()
 
 void SelectionSet::kill()
 {
-    if (m_pSingleton != 0)
+    if (m_pSingleton != nullptr)
     {
         delete m_pSingleton;
-        m_pSingleton = 0;
+        m_pSingleton = nullptr;
     }
 }
 
@@ -40,11 +40,6 @@ SelectionSet::SelectionSet()
 
 }
 
-SelectionSet::~SelectionSet()
-{
-
-}
-
 void SelectionSet::append(Ogre::SceneNode* const& obj)
 {
     if(!mNodesSelected.contains(obj))

diff --git a/src/SelectionSet.h b/src/SelectionSet.h
@@ -18,7 +18,7 @@ public :
 
 private:
     SelectionSet();
-    ~SelectionSet(void);
+    ~SelectionSet(void) override = default;
 
 public :
     void append(Ogre::SceneNode* const& obj);

diff --git a/src/SkeletonTransform.cpp b/src/SkeletonTransform.cpp
@@ -37,10 +37,6 @@ THE SOFTWARE.
 
 #include "Manager.h"
 
-SkeletonTransform::SkeletonTransform()
-{
-}
-
 void SkeletonTransform::scaleSkeleton(const Ogre::Entity *_ent, const Ogre::Vector3 &_scale)
 {
     if(_ent->hasSkeleton())
@@ -103,7 +99,7 @@ void SkeletonTransform::translateSkeleton(const Ogre::Entity *_ent, const Ogre::
         auto bones = sk->getBones();
         for(const auto &bone : bones)
         {
-            if(bone->getParent()==NULL)
+            if(bone->getParent()==nullptr)
             {
                 if(_translate.isZeroLength())
                     continue;
@@ -139,7 +135,7 @@ void SkeletonTransform::rotateSkeleton(const Ogre::Entity *_ent, const Ogre::Vec
         auto bones = sk->getBones();
         for(const auto &bone : bones)
         {
-            if(bone->getParent()==NULL)
+            if(bone->getParent()==nullptr)
             {
                 if(_rotate.x!=0)
                     bone->rotate(Ogre::Quaternion(Ogre::Degree(_rotate.x), Ogre::Vector3::UNIT_Y),Ogre::Node::TS_WORLD);

diff --git a/src/SkeletonTransform.h b/src/SkeletonTransform.h
@@ -35,7 +35,7 @@ THE SOFTWARE.
 class SkeletonTransform
 {
 public:
-    SkeletonTransform();
+    SkeletonTransform() = delete;
     static void scaleSkeleton(const Ogre::Entity *_ent, const Ogre::Vector3 &_scale);
     static void translateSkeleton(const Ogre::Entity *_ent, const Ogre::Vector3 &_translate);
     static void rotateSkeleton(const Ogre::Entity *_ent, const Ogre::Vector3 &_rotate);

diff --git a/src/SpaceCamera.cpp b/src/SpaceCamera.cpp
@@ -40,9 +40,9 @@ const QPoint    SpaceCamera::invalidPoint(-1,-1);
 
 SpaceCamera::SpaceCamera(OgreWidget* parent)
     :mSceneMgr(Manager::getSingleton()->getSceneMgr())
-    ,mCameraNode(NULL)
-    ,mTarget(NULL)
-    ,mCamera(NULL)
+    ,mCameraNode(nullptr)
+    ,mTarget(nullptr)
+    ,mCamera(nullptr)
     ,mCameraSpeed(0.5f)
     ,mOldPos(invalidPoint)
 {
@@ -52,7 +52,7 @@ SpaceCamera::SpaceCamera(OgreWidget* parent)
     }
     mCamera = mSceneMgr->createCamera(name.toLocal8Bit().constData());
 
-    if (mCamera == 0)
+    if (mCamera == nullptr)
         throw std::logic_error("TPCamera::TPCamera - 'Ogre::Camera* camera' == NULL");
 
     mCamera->setFarClipDistance(999999999.9f);

diff --git a/src/SpaceCamera_test.cpp b/src/SpaceCamera_test.cpp
@@ -12,7 +12,7 @@ class MockSpaceCamera : public SpaceCamera
 public:
     // Mock constructor
     MockSpaceCamera():SpaceCamera(){}
-    virtual ~MockSpaceCamera() {};
+    virtual ~MockSpaceCamera() = default;
 };
 
 TEST(SpaceCamera, InitialSpeed)