diff --git a/GUI/Model/Descriptor/UIntProperty.cpp b/GUI/Model/Descriptor/UIntProperty.cpp index 4a64ce1b69dd0464b7ee171a228c97e34b1c9f57..c4a851a5f0470cb60c9fba4f0be665496dcc4ca8 100644 --- a/GUI/Model/Descriptor/UIntProperty.cpp +++ b/GUI/Model/Descriptor/UIntProperty.cpp @@ -17,6 +17,8 @@ #include "GUI/Support/XML/UtilXML.h" #include <QUuid> +using std::variant; + void UIntProperty::init(const QString& label, const QString& tooltip, uint value, const variant<QString, Unit>& unit, const QString& persistentTag) { diff --git a/GUI/Model/Descriptor/UIntProperty.h b/GUI/Model/Descriptor/UIntProperty.h index a6bce7d06bf851b823eaf020afdc2dcfc2f6604e..924c43295563d5a8edb6b4f1f8ce092acbe6de37 100644 --- a/GUI/Model/Descriptor/UIntProperty.h +++ b/GUI/Model/Descriptor/UIntProperty.h @@ -17,17 +17,11 @@ #include "Fit/Param/RealLimits.h" #include "GUI/Model/Descriptor/UIntDescriptor.h" -#include "GUI/Support/Type/Unit.h" -#include <QString> -#include <functional> #include <variant> class Streamer; class SessionItem; -using std::function; -using std::variant; - //! Class for representing a uint value, its attributes and its accessors. //! //! For a complete description please refer to the documentation of DoubleProperty. Everything said @@ -39,9 +33,9 @@ using std::variant; class UIntProperty { public: void init(const QString& label, const QString& tooltip, uint value, - const variant<QString, Unit>& unit, const QString& persistentTag); + const std::variant<QString, Unit>& unit, const QString& persistentTag); void init(const QString& label, const QString& tooltip, uint value, - const variant<QString, Unit>& unit, const RealLimits& limits, + const std::variant<QString, Unit>& unit, const RealLimits& limits, const QString& persistentTag); UIntDescriptor descriptor() const { return m_descriptor; }