HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r846:3f7ba55eb4d2

Fixes for review

trabillard -

r846:3f7ba55eb4d2

parent child

Context file:

r846:3f7ba55eb4d2

gui/include/Visualization/VisualizationDragDropContainer.h +3 -3

-            #ifndef VISUALIZATIONDRAGDROPCONTAINER_H
+            #ifndef SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H
-            #define VISUALIZATIONDRAGDROPCONTAINER_H
+            #define SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H
             #include <Common/spimpl.h>
             #include <QMimeData>
                 void startDrag(VisualizationDragWidget *dragWidget, const QPoint &dragPosition);
             };
-            #endif // VISUALIZATIONDRAGDROPCONTAINER_H
+            #endif // SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H

gui/include/Visualization/VisualizationDragWidget.h +3 -3

-            #ifndef VISUALIZATIONDRAGWIDGET_H
+            #ifndef SCIQLOP_VISUALIZATIONDRAGWIDGET_H
-            #define VISUALIZATIONDRAGWIDGET_H
+            #define SCIQLOP_VISUALIZATIONDRAGWIDGET_H
             #include <Common/spimpl.h>
             #include <QMimeData>
                 void dragDetected(VisualizationDragWidget *dragWidget, const QPoint &dragPosition);
             };
-            #endif // VISUALIZATIONDRAGWIDGET_H
+            #endif // SCIQLOP_VISUALIZATIONDRAGWIDGET_H

gui/src/Visualization/VisualizationDragDropContainer.cpp +9 -9

                     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()));
                 }
             };
             {
                 auto nbGraph = 0;
                 for (auto child : children()) {
-                    auto widget = qobject_cast<VisualizationDragWidget *>(child);
+                    if (qobject_cast<VisualizationDragWidget *>(child)) {
-                    if (widget) {
                         nbGraph += 1;
                     }
                 }
                 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();
                         }
                     }
                 }
-                else
+                else {
                     event->ignore();
+                }
                 QWidget::dragEnterEvent(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)
                         }
                     }
                 }
-                else
+                else {
                     event->ignore();
+                }
                 QWidget::dragMoveEvent(event);
             }
                         }
                         dragWidget->setVisible(true);
-                        dragWidget->setStyleSheet("");
                         event->acceptProposedAction();
                         emit dropOccured(droppedIndex, event->mimeData());
                     }
                 }
-                else
+                else {
                     event->ignore();
+                }
                 QWidget::dropEvent(event);
             }

gui/src/Visualization/VisualizationGraphWidget.cpp +3 -3

             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);
             }
             QMimeData *VisualizationGraphWidget::mimeData() const
             {
-                auto *mimeData = new QMimeData;
+                auto mimeData = new QMimeData;
                 mimeData->setData(DragDropHelper::MIME_TYPE_GRAPH, QByteArray());
                 return mimeData;

gui/src/Visualization/VisualizationZoneWidget.cpp +1 -1

             QMimeData *VisualizationZoneWidget::mimeData() const
             {
-                auto *mimeData = new QMimeData;
+                auto mimeData = new QMimeData;
                 mimeData->setData(DragDropHelper::MIME_TYPE_ZONE, QByteArray());
                 return mimeData;

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages