From 13f087caf432a4d11775ae7666438624adceb075 Mon Sep 17 00:00:00 2001
From: Rainer Kartmann <rainer.kartmann@student.kit.edu>
Date: Tue, 29 Jan 2019 16:58:15 +0100
Subject: [PATCH] Fixed style and warnings

---
 .../DebugDrawerViewerWidgetController.cpp     | 33 ++++++-------
 .../DebugDrawerViewerWidgetController.h       | 47 +++++++++----------
 2 files changed, 35 insertions(+), 45 deletions(-)

diff --git a/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp b/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp
index 7f2e385d2..e4cda5e36 100644
--- a/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp
+++ b/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.cpp
@@ -19,35 +19,31 @@
  * \copyright  http://www.gnu.org/licenses/gpl-2.0.txt
  *             GNU General Public License
  */
-
 #include "DebugDrawerViewerWidgetController.h"
+
 #include <ArmarXCore/core/ArmarXManager.h>
 #include <string>
 
+
 using namespace armarx;
 
+
 DebugDrawerViewerWidgetController::DebugDrawerViewerWidgetController()
 {
-    rootVisu = NULL;
+    rootVisu = nullptr;
     widget.setupUi(getWidget());
 
 }
 
 
-DebugDrawerViewerWidgetController::~DebugDrawerViewerWidgetController()
-{
-
-}
-
-
 void DebugDrawerViewerWidgetController::loadSettings(QSettings* settings)
 {
-
+    (void) settings;  // unused
 }
 
 void DebugDrawerViewerWidgetController::saveSettings(QSettings* settings)
 {
-
+    (void) settings;  // unused
 }
 
 
@@ -89,28 +85,27 @@ void DebugDrawerViewerWidgetController::onConnectComponent()
     enableMainWidgetAsync(true);
 }
 
-
-SoNode* DebugDrawerViewerWidgetController::getScene()
-{
-    return rootVisu;
-}
-
-
 void armarx::DebugDrawerViewerWidgetController::onExitComponent()
 {
     if (rootVisu)
     {
         rootVisu->removeAllChildren();
         rootVisu->unref();
-        rootVisu = NULL;
+        rootVisu = nullptr;
     }
 }
 
+
+SoNode* DebugDrawerViewerWidgetController::getScene()
+{
+    return rootVisu;
+}
+
 void armarx::DebugDrawerViewerWidgetController::on_btnClearAll_clicked()
 {
-    ARMARX_INFO << "Clearing visu";
     if (debugDrawer)
     {
+        ARMARX_INFO << "Clearing all visualization layers";
         debugDrawer->clearAll();
     }
 }
diff --git a/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.h b/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.h
index baf1ca3ba..49544db52 100644
--- a/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.h
+++ b/source/RobotAPI/gui-plugins/DebugDrawerViewer/DebugDrawerViewerWidgetController.h
@@ -31,6 +31,7 @@
 
 #include <ArmarXCore/core/system/ImportExportComponent.h>
 
+
 namespace armarx
 {
     /**
@@ -51,30 +52,23 @@ namespace armarx
      * Detailed description
      */
     class ARMARXCOMPONENT_IMPORT_EXPORT
-        DebugDrawerViewerWidgetController:
+        DebugDrawerViewerWidgetController :
         public ArmarXComponentWidgetControllerTemplate<DebugDrawerViewerWidgetController>
     {
         Q_OBJECT
 
     public:
-        /**
-         * Controller Constructor
-         */
+
+        /// Controller Constructor
         explicit DebugDrawerViewerWidgetController();
 
-        /**
-         * Controller destructor
-         */
-        ~DebugDrawerViewerWidgetController() override;
+        /// Controller destructor
+        virtual ~DebugDrawerViewerWidgetController() override = default;
 
-        /**
-         * @see ArmarXWidgetController::loadSettings()
-         */
+        /// @see ArmarXWidgetController::loadSettings()
         void loadSettings(QSettings* settings) override;
 
-        /**
-         * @see ArmarXWidgetController::saveSettings()
-         */
+        /// @see ArmarXWidgetController::saveSettings()
         void saveSettings(QSettings* settings) override;
 
         /**
@@ -86,39 +80,40 @@ namespace armarx
             return "Visualization.DebugDrawerViewer";
         }
 
-        /**
-         * \see armarx::Component::onInitComponent()
-         */
+        /// @see armarx::Component::onInitComponent()
         void onInitComponent() override;
 
-        /**
-         * \see armarx::Component::onConnectComponent()
-         */
+        /// @see armarx::Component::onConnectComponent()
         void onConnectComponent() override;
 
         void onExitComponent() override;
 
+
     public slots:
         /* QT slot declarations */
 
     signals:
         /* QT signal declarations */
 
+
+    private slots:
+
+        /// Clear all layers.
+        void on_btnClearAll_clicked();
     private:
-        /**
-         * Widget Form
-         */
+
+        /// Widget Form
         Ui::DebugDrawerViewerWidget widget;
+
+        /// The debug drawer.
         armarx::DebugDrawerComponentPtr debugDrawer;
+
         SoSeparator* rootVisu;
 
         // ArmarXWidgetController interface
     public:
         SoNode* getScene() override;
 
-    private slots:
-        void on_btnClearAll_clicked();
-
         // ArmarXWidgetController interface
     public:
         static QIcon GetWidgetIcon()
-- 
GitLab