From 9b45c5936f92f47dd4e1a893a3dbfdaaacee7ea8 2017-11-06 15:58:02
From: Thibaud Rabillard <trabillard@itlink.fr>
Date: 2017-11-06 15:58:02
Subject: [PATCH] Moves the DragDropHelper file

---

diff --git a/gui/include/DragDropHelper.h b/gui/include/DragAndDrop/DragDropHelper.h
similarity index 100%
rename from gui/include/DragDropHelper.h
rename to gui/include/DragAndDrop/DragDropHelper.h
diff --git a/gui/include/Visualization/VisualizationDragDropContainer.h b/gui/include/Visualization/VisualizationDragDropContainer.h
index 65e630b..d100bff 100644
--- a/gui/include/Visualization/VisualizationDragDropContainer.h
+++ b/gui/include/Visualization/VisualizationDragDropContainer.h
@@ -9,7 +9,7 @@
 
 #include <functional>
 
-#include <DragDropHelper.h>
+#include <DragAndDrop/DragDropHelper.h>
 
 Q_DECLARE_LOGGING_CATEGORY(LOG_VisualizationDragDropContainer)
 
diff --git a/gui/meson.build b/gui/meson.build
index 9da44ab..d372234 100644
--- a/gui/meson.build
+++ b/gui/meson.build
@@ -6,7 +6,7 @@ gui_moc_headers = [
   'include/Settings/SqpSettingsGeneralWidget.h',
   'include/SidePane/SqpSidePane.h',
   'include/SqpApplication.h',
-  'include/DragDropHelper.h',
+  'include/DragAndDrop/DragDropHelper.h',
   'include/TimeWidget/TimeWidget.h',
   'include/Variable/VariableInspectorWidget.h',
   'include/Variable/VariableInspectorTableView.h',
@@ -43,7 +43,7 @@ gui_moc_files = qt5.preprocess(moc_headers : gui_moc_headers,
 
 gui_sources = [
   'src/SqpApplication.cpp',
-  'src/DragDropHelper.cpp',
+  'src/DragAndDrop/DragDropHelper.cpp',
   'src/Common/ColorUtils.cpp',
   'src/Common/VisualizationDef.cpp',
   'src/DataSource/DataSourceTreeWidgetItem.cpp',
diff --git a/gui/src/DataSource/DataSourceTreeWidget.cpp b/gui/src/DataSource/DataSourceTreeWidget.cpp
index 97e62b1..24f7f00 100644
--- a/gui/src/DataSource/DataSourceTreeWidget.cpp
+++ b/gui/src/DataSource/DataSourceTreeWidget.cpp
@@ -4,7 +4,7 @@
 #include "DataSource/DataSourceItem.h"
 #include "DataSource/DataSourceTreeWidgetItem.h"
 
-#include "DragDropHelper.h"
+#include "DragAndDrop/DragDropHelper.h"
 #include "SqpApplication.h"
 
 #include <QMimeData>
diff --git a/gui/src/DragDropHelper.cpp b/gui/src/DragAndDrop/DragDropHelper.cpp
similarity index 98%
rename from gui/src/DragDropHelper.cpp
rename to gui/src/DragAndDrop/DragDropHelper.cpp
index 046d142..37b296b 100644
--- a/gui/src/DragDropHelper.cpp
+++ b/gui/src/DragAndDrop/DragDropHelper.cpp
@@ -1,4 +1,4 @@
-#include "DragDropHelper.h"
+#include "DragAndDrop/DragDropHelper.h"
 #include "SqpApplication.h"
 #include "Visualization/VisualizationDragDropContainer.h"
 #include "Visualization/VisualizationDragWidget.h"
@@ -211,9 +211,7 @@ struct DragDropHelper::DragDropHelperPrivate {
 };
 
 
-DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()}
-{
-}
+DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()} {}
 
 DragDropHelper::~DragDropHelper()
 {
diff --git a/gui/src/SqpApplication.cpp b/gui/src/SqpApplication.cpp
index 7b200c1..aa0e813 100644
--- a/gui/src/SqpApplication.cpp
+++ b/gui/src/SqpApplication.cpp
@@ -2,7 +2,7 @@
 
 #include <Data/IDataProvider.h>
 #include <DataSource/DataSourceController.h>
-#include <DragDropHelper.h>
+#include <DragAndDrop/DragDropHelper.h>
 #include <Network/NetworkController.h>
 #include <QThread>
 #include <Time/TimeController.h>
diff --git a/gui/src/TimeWidget/TimeWidget.cpp b/gui/src/TimeWidget/TimeWidget.cpp
index 9d095ee..050eae3 100644
--- a/gui/src/TimeWidget/TimeWidget.cpp
+++ b/gui/src/TimeWidget/TimeWidget.cpp
@@ -4,7 +4,7 @@
 #include <Common/DateUtils.h>
 #include <Common/MimeTypesDef.h>
 
-#include <DragDropHelper.h>
+#include <DragAndDrop/DragDropHelper.h>
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
 
diff --git a/gui/src/Variable/VariableInspectorTableView.cpp b/gui/src/Variable/VariableInspectorTableView.cpp
index e03b5d3..9d752a1 100644
--- a/gui/src/Variable/VariableInspectorTableView.cpp
+++ b/gui/src/Variable/VariableInspectorTableView.cpp
@@ -1,6 +1,6 @@
 #include "Variable/VariableInspectorTableView.h"
 
-#include "DragDropHelper.h"
+#include "DragAndDrop/DragDropHelper.h"
 #include "SqpApplication.h"
 
 VariableInspectorTableView::VariableInspectorTableView(QWidget *parent) : QTableView(parent) {}
diff --git a/gui/src/Variable/VariableInspectorWidget.cpp b/gui/src/Variable/VariableInspectorWidget.cpp
index 8cd27ba..849bec7 100644
--- a/gui/src/Variable/VariableInspectorWidget.cpp
+++ b/gui/src/Variable/VariableInspectorWidget.cpp
@@ -12,7 +12,7 @@
 #include <QStyledItemDelegate>
 #include <QWidgetAction>
 
-#include <DragDropHelper.h>
+#include <DragAndDrop/DragDropHelper.h>
 #include <SqpApplication.h>
 
 Q_LOGGING_CATEGORY(LOG_VariableInspectorWidget, "VariableInspectorWidget")
diff --git a/gui/src/Visualization/VisualizationDragDropContainer.cpp b/gui/src/Visualization/VisualizationDragDropContainer.cpp
index 969b6af..714d369 100644
--- a/gui/src/Visualization/VisualizationDragDropContainer.cpp
+++ b/gui/src/Visualization/VisualizationDragDropContainer.cpp
@@ -1,5 +1,5 @@
 #include "Visualization/VisualizationDragDropContainer.h"
-#include "DragDropHelper.h"
+#include "DragAndDrop/DragDropHelper.h"
 #include "SqpApplication.h"
 #include "Visualization/VisualizationDragWidget.h"
 
diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp
index a8cb3d7..ba0672b 100644
--- a/gui/src/Visualization/VisualizationGraphWidget.cpp
+++ b/gui/src/Visualization/VisualizationGraphWidget.cpp
@@ -9,7 +9,7 @@
 #include <Common/MimeTypesDef.h>
 #include <Data/ArrayData.h>
 #include <Data/IDataSeries.h>
-#include <DragDropHelper.h>
+#include <DragAndDrop/DragDropHelper.h>
 #include <Settings/SqpSettingsDefs.h>
 #include <SqpApplication.h>
 #include <Time/TimeController.h>
diff --git a/gui/src/Visualization/VisualizationTabWidget.cpp b/gui/src/Visualization/VisualizationTabWidget.cpp
index 236b512..9c6d8ab 100644
--- a/gui/src/Visualization/VisualizationTabWidget.cpp
+++ b/gui/src/Visualization/VisualizationTabWidget.cpp
@@ -9,7 +9,7 @@
 
 #include "Common/MimeTypesDef.h"
 
-#include "DragDropHelper.h"
+#include "DragAndDrop/DragDropHelper.h"
 #include "SqpApplication.h"
 
 Q_LOGGING_CATEGORY(LOG_VisualizationTabWidget, "VisualizationTabWidget")
diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp
index 69b0df3..0a911cb 100644
--- a/gui/src/Visualization/VisualizationZoneWidget.cpp
+++ b/gui/src/Visualization/VisualizationZoneWidget.cpp
@@ -16,7 +16,7 @@
 
 #include <Visualization/operations/FindVariableOperation.h>
 
-#include <DragDropHelper.h>
+#include <DragAndDrop/DragDropHelper.h>
 #include <QUuid>
 #include <SqpApplication.h>
 #include <cmath>