summaryrefslogtreecommitdiffhomepage
path: root/spline
diff options
context:
space:
mode:
Diffstat (limited to 'spline')
-rw-r--r--spline/spline-widget.cpp2
-rw-r--r--spline/spline-widget.hpp2
-rw-r--r--spline/spline.cpp2
-rw-r--r--spline/spline.hpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/spline/spline-widget.cpp b/spline/spline-widget.cpp
index a4b9534f..2d66371c 100644
--- a/spline/spline-widget.cpp
+++ b/spline/spline-widget.cpp
@@ -49,7 +49,7 @@ void spline_widget::setConfig(base_spline* spl)
update_range();
std::shared_ptr<base_spline::base_settings> s = spl->get_settings();
- connection = connect(s.get(), &spline::base_settings::recomputed,
+ connection = connect(s.get(), &base_spline::base_settings::recomputed,
this, [this] { reload_spline(); },
Qt::QueuedConnection);
}
diff --git a/spline/spline-widget.hpp b/spline/spline-widget.hpp
index 737b29f1..a6d0eb9d 100644
--- a/spline/spline-widget.hpp
+++ b/spline/spline-widget.hpp
@@ -34,7 +34,7 @@ class OTR_SPLINE_EXPORT spline_widget final : public QWidget
Q_PROPERTY(int x_step READ x_step WRITE set_x_step)
Q_PROPERTY(int y_step READ y_step WRITE set_y_step)
- using points_t = spline::points_t;
+ using points_t = base_spline::points_t;
public:
explicit spline_widget(QWidget *parent = nullptr);
~spline_widget() override;
diff --git a/spline/spline.cpp b/spline/spline.cpp
index ae32b896..203822e7 100644
--- a/spline/spline.cpp
+++ b/spline/spline.cpp
@@ -100,7 +100,7 @@ float spline::get_value_no_save_internal(double x)
return ret;
}
-cc_warn_unused_result bool spline::get_last_value(QPointF& point)
+bool spline::get_last_value(QPointF& point)
{
QMutexLocker foo(&_mutex);
point = last_input_value;
diff --git a/spline/spline.hpp b/spline/spline.hpp
index faecbb2c..eb6c7b8c 100644
--- a/spline/spline.hpp
+++ b/spline/spline.hpp
@@ -55,7 +55,7 @@ struct OTR_SPLINE_EXPORT base_spline_
virtual float get_value(double x) = 0;
virtual float get_value_no_save(double x) const = 0;
- cc_warn_unused_result virtual bool get_last_value(QPointF& point) = 0;
+ [[nodiscard]] virtual bool get_last_value(QPointF& point) = 0;
virtual void set_tracking_active(bool value) = 0;
virtual double max_input() const = 0;
@@ -139,7 +139,7 @@ public:
float get_value(double x) override;
float get_value_no_save(double x) const override;
- cc_warn_unused_result bool get_last_value(QPointF& point) override;
+ [[nodiscard]] bool get_last_value(QPointF& point) override;
void add_point(QPointF pt) override;
void add_point(double x, double y) override;