From 3f7ba55eb4d20742759aed57736c8fe5470cc7ba 2017-10-26 08:41:35
From: Thibaud Rabillard <trabillard@itlink.fr>
Date: 2017-10-26 08:41:35
Subject: [PATCH] Fixes for review

---

diff --git a/gui/include/Visualization/VisualizationDragDropContainer.h b/gui/include/Visualization/VisualizationDragDropContainer.h
index 8520c0c..d8460de 100644
--- a/gui/include/Visualization/VisualizationDragDropContainer.h
+++ b/gui/include/Visualization/VisualizationDragDropContainer.h
@@ -1,5 +1,5 @@
-#ifndef VISUALIZATIONDRAGDROPCONTAINER_H
-#define VISUALIZATIONDRAGDROPCONTAINER_H
+#ifndef SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H
+#define SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H
 
 #include <Common/spimpl.h>
 #include <QMimeData>
@@ -39,4 +39,4 @@ private slots:
     void startDrag(VisualizationDragWidget *dragWidget, const QPoint &dragPosition);
 };
 
-#endif // VISUALIZATIONDRAGDROPCONTAINER_H
+#endif // SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H
diff --git a/gui/include/Visualization/VisualizationDragWidget.h b/gui/include/Visualization/VisualizationDragWidget.h
index b723cb0..3552cef 100644
--- a/gui/include/Visualization/VisualizationDragWidget.h
+++ b/gui/include/Visualization/VisualizationDragWidget.h
@@ -1,5 +1,5 @@
-#ifndef VISUALIZATIONDRAGWIDGET_H
-#define VISUALIZATIONDRAGWIDGET_H
+#ifndef SCIQLOP_VISUALIZATIONDRAGWIDGET_H
+#define SCIQLOP_VISUALIZATIONDRAGWIDGET_H
 
 #include <Common/spimpl.h>
 #include <QMimeData>
@@ -26,4 +26,4 @@ signals:
     void dragDetected(VisualizationDragWidget *dragWidget, const QPoint &dragPosition);
 };
 
-#endif // VISUALIZATIONDRAGWIDGET_H
+#endif // SCIQLOP_VISUALIZATIONDRAGWIDGET_H
diff --git a/gui/src/Visualization/VisualizationDragDropContainer.cpp b/gui/src/Visualization/VisualizationDragDropContainer.cpp
index b1bd34b..e128e8d 100644
--- a/gui/src/Visualization/VisualizationDragDropContainer.cpp
+++ b/gui/src/Visualization/VisualizationDragDropContainer.cpp
@@ -71,7 +71,6 @@ struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate {
         auto adustNum = 18; // to be safe, in case of scrollbar on the side
         auto containerRect = QRect(QPoint(), container->contentsRect().size())
                                  .adjusted(adustNum, adustNum, -adustNum, -adustNum);
-        qDebug() << containerRect << container->mapFromGlobal(QCursor::pos());
         return containerRect.contains(container->mapFromGlobal(QCursor::pos()));
     }
 };
@@ -114,8 +113,7 @@ int VisualizationDragDropContainer::countDragWidget() const
 {
     auto nbGraph = 0;
     for (auto child : children()) {
-        auto widget = qobject_cast<VisualizationDragWidget *>(child);
-        if (widget) {
+        if (qobject_cast<VisualizationDragWidget *>(child)) {
             nbGraph += 1;
         }
     }
@@ -129,7 +127,7 @@ void VisualizationDragDropContainer::startDrag(VisualizationDragWidget *dragWidg
     auto &helper = sqpApp->dragDropHelper();
 
     // Note: The management of the drag object is done by Qt
-    auto *drag = new QDrag{dragWidget};
+    auto drag = new QDrag{dragWidget};
     drag->setHotSpot(dragPosition);
 
     auto mimeData = dragWidget->mimeData();
@@ -189,8 +187,9 @@ void VisualizationDragDropContainer::dragEnterEvent(QDragEnterEvent *event)
             }
         }
     }
-    else
+    else {
         event->ignore();
+    }
 
     QWidget::dragEnterEvent(event);
 }
@@ -206,7 +205,7 @@ void VisualizationDragDropContainer::dragLeaveEvent(QDragLeaveEvent *event)
 
         bool isInternal = true;
         if (isInternal) {
-            // Only if the drag is strated from the visualization
+            // Only if the drag is started from the visualization
             // Show the drag widget at its original place
             // So the drag widget doesn't stay hidden if the drop occurs outside the visualization
             // drop zone (It is not possible to catch a drop event outside of the application)
@@ -264,8 +263,9 @@ void VisualizationDragDropContainer::dragMoveEvent(QDragMoveEvent *event)
             }
         }
     }
-    else
+    else {
         event->ignore();
+    }
 
     QWidget::dragMoveEvent(event);
 }
@@ -286,7 +286,6 @@ void VisualizationDragDropContainer::dropEvent(QDropEvent *event)
             }
 
             dragWidget->setVisible(true);
-            dragWidget->setStyleSheet("");
 
             event->acceptProposedAction();
 
@@ -295,8 +294,9 @@ void VisualizationDragDropContainer::dropEvent(QDropEvent *event)
             emit dropOccured(droppedIndex, event->mimeData());
         }
     }
-    else
+    else {
         event->ignore();
+    }
 
     QWidget::dropEvent(event);
 }
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index bce8122..cc42944 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -97,9 +97,9 @@ VisualizationGraphWidget::~VisualizationGraphWidget()
 VisualizationZoneWidget *VisualizationGraphWidget::parentZoneWidget() const noexcept
 {
     auto parent = parentWidget();
-    do {
+    while (parent != nullptr && !qobject_cast<VisualizationZoneWidget *>(parent)) {
         parent = parent->parentWidget();
-    } while (parent != nullptr && !qobject_cast<VisualizationZoneWidget *>(parent));
+    }
 
     return qobject_cast<VisualizationZoneWidget *>(parent);
 }
@@ -231,7 +231,7 @@ QString VisualizationGraphWidget::name() const
 
 QMimeData *VisualizationGraphWidget::mimeData() const
 {
-    auto *mimeData = new QMimeData;
+    auto mimeData = new QMimeData;
     mimeData->setData(DragDropHelper::MIME_TYPE_GRAPH, QByteArray());
 
     return mimeData;
diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp
index 316f4d1..45355c5 100644
--- a/gui/src/Visualization/VisualizationZoneWidget.cpp
+++ b/gui/src/Visualization/VisualizationZoneWidget.cpp
@@ -314,7 +314,7 @@ QString VisualizationZoneWidget::name() const
 
 QMimeData *VisualizationZoneWidget::mimeData() const
 {
-    auto *mimeData = new QMimeData;
+    auto mimeData = new QMimeData;
     mimeData->setData(DragDropHelper::MIME_TYPE_ZONE, QByteArray());
 
     return mimeData;