UIntDescriptor: rm SessionItem

GUI/Model/Descriptor/UIntDescriptor.cpp

@@ -14,35 +14,16 @@
 
 #include "GUI/Model/Descriptor/UIntDescriptor.h"
 
-#include "GUI/Model/BaseItem/SessionItem.h"
-#include <utility>
-
-using std::function;
-using std::variant;
-
-UIntDescriptor::UIntDescriptor(const QString& label, SessionItem* item,
-                               const variant<QString, Unit>& unit)
-    : UIntDescriptor(
-        label, item->toolTip(), item->limits(), [=](int d) { item->setValue(d); },
-        [=]() { return item->value().toInt(); }, unit)
-{
-}
-
-UIntDescriptor::UIntDescriptor(SessionItem* item, const variant<QString, Unit>& unit)
-    : UIntDescriptor(item->displayName(), item, unit)
-{
-}
-
 UIntDescriptor::UIntDescriptor(const QString& label, const QString& tooltip,
-                               function<void(uint)> setter, function<uint()> getter,
-                               const variant<QString, Unit>& unit)
+                               std::function<void(uint)> setter, std::function<uint()> getter,
+                               const std::variant<QString, Unit>& unit)
     : UIntDescriptor(label, tooltip, RealLimits::nonnegative(), setter, getter, unit)
 {
 }
 
 UIntDescriptor::UIntDescriptor(QString label, QString tooltip, const RealLimits& limits,
-                               function<void(uint)> setter, function<uint()> getter,
-                               const variant<QString, Unit>& unit)
+                               std::function<void(uint)> setter, std::function<uint()> getter,
+                               const std::variant<QString, Unit>& unit)
     : label(std::move(label))
     , tooltip(std::move(tooltip))
     , limits(limits)
@@ -53,7 +34,7 @@ UIntDescriptor::UIntDescriptor(QString label, QString tooltip, const RealLimits&
 }
 
 UIntDescriptor::UIntDescriptor(const QString& label, const uint* var,
-                               const variant<QString, Unit>& unit)
+                               const std::variant<QString, Unit>& unit)
     : UIntDescriptor(
         label, "", RealLimits::nonnegative(), [=](uint v) { *const_cast<uint*>(var) = v; },
         [=] { return *var; }, unit)

GUI/Model/Descriptor/UIntDescriptor.h

@@ -21,27 +21,14 @@
 #include <functional>
 #include <variant>
 
-class SessionItem;
-
 //! Describes properties of a uint value which are necessary to allow GUI representation, editing
 //! the value, undo/redo, unit conversion.
 //!
-//! By using this class, the underlying data scheme is hidden from the user of the data. This e.g.
-//! eases SessionItem migration. The underlying implementation can be a SessionItem, a simple uint
-//! member, or any other construction to hold a uint value.
+//! By using this class, the underlying data scheme is hidden from the user of the data. The underlying implementation
+//! can be a simple uint member, or any other construction to hold a uint value.
 class UIntDescriptor {
 public:
     UIntDescriptor() = default;
-    //! Operates on a session item. The settings (like limits) are taken from the session
-    //! item.
-    //! Only for easier migration. Should be removed after SessionItem refactoring.
-    UIntDescriptor(SessionItem* item, const std::variant<QString, Unit>& unit);
-
-    //! Operates on a session item. The settings (like limits) are taken from the session
-    //! item.
-    //! Only for easier migration. Should be removed after SessionItem refactoring.
-    UIntDescriptor(const QString& label, SessionItem* item,
-                   const std::variant<QString, Unit>& unit);
 
     UIntDescriptor(const QString& label, const uint* var, const std::variant<QString, Unit>& unit);