From 06665bde582d2dbfc6bc0200c5ebe44d82af11b2 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Wed, 30 Nov 2022 14:54:36 +0100
Subject: [PATCH] mv DoubleDescriptors to DoubleProperty
---
GUI/Model/Descriptor/DoubleDescriptor.h | 3 ---
GUI/Model/Descriptor/DoubleProperty.h | 2 ++
GUI/View/SampleDesigner/LayerEditorUtils.h | 6 +++---
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/GUI/Model/Descriptor/DoubleDescriptor.h b/GUI/Model/Descriptor/DoubleDescriptor.h
index 16d5b0c3963..eb24549e343 100644
--- a/GUI/Model/Descriptor/DoubleDescriptor.h
+++ b/GUI/Model/Descriptor/DoubleDescriptor.h
@@ -85,7 +85,4 @@ public:
nullptr; //!< Path describing this value. Used e.g. for undo/redo
};
-using DoubleDescriptors = QList<DoubleDescriptor>;
-
-
#endif // BORNAGAIN_GUI_MODEL_DESCRIPTOR_DOUBLEDESCRIPTOR_H
diff --git a/GUI/Model/Descriptor/DoubleProperty.h b/GUI/Model/Descriptor/DoubleProperty.h
index 2168c053c3b..c44ee6998bd 100644
--- a/GUI/Model/Descriptor/DoubleProperty.h
+++ b/GUI/Model/Descriptor/DoubleProperty.h
@@ -120,4 +120,6 @@ public: \
// clang-format on
+using DoubleDescriptors = QList<DoubleDescriptor>;
+
#endif // BORNAGAIN_GUI_MODEL_DESCRIPTOR_DOUBLEPROPERTY_H
diff --git a/GUI/View/SampleDesigner/LayerEditorUtils.h b/GUI/View/SampleDesigner/LayerEditorUtils.h
index 25854f96b22..54462cadcbb 100644
--- a/GUI/View/SampleDesigner/LayerEditorUtils.h
+++ b/GUI/View/SampleDesigner/LayerEditorUtils.h
@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
#define BORNAGAIN_GUI_VIEW_SAMPLEDESIGNER_LAYEREDITORUTILS_H
-#include "GUI/Model/Descriptor/DoubleDescriptor.h"
+#include "GUI/Model/Descriptor/DoubleProperty.h"
#include "GUI/Model/CatSample/FormFactorItemCatalog.h"
#include "GUI/Model/CatSample/ItemWithParticlesCatalog.h"
@@ -24,10 +24,11 @@
#include <functional>
class DoubleSpinBox;
-class Profile1DItem;
class FormFactorItem;
class ItemWithParticles;
class LayerBasicRoughnessItem;
+class Profile1DItem;
+class Profile2DItem;
class QGridLayout;
class QLabel;
class QPushButton;
@@ -36,7 +37,6 @@ class QWidget;
class RotationItem;
class SampleEditorController;
class VectorProperty;
-class Profile2DItem;
//! Utility functions to support layer oriented sample editor
namespace LayerEditorUtils {
--
GitLab