diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-21 17:34:00 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-08-23 00:05:15 +0200 |
commit | d6dffea39f3546e29a0cf1689d7d83b84dedfd9d (patch) | |
tree | 4f1f79d63631aae845dd130cb0b608540dec8fad /spline-widget/spline-widget.hpp | |
parent | 550390d6d2f4e7ea21f6fa407e3b054a8ac12fd4 (diff) |
spline-widget: multiple fixes
- add missing locking
- bundle and settings ptr are never null following initialization;
sentinel objects get created if there's no bundle, thus don't branch
outside initialization functions. the sentinel object doesn't load or
save to the .ini file
- connect spline refresh to any bundle change
- connect spline widget refresh to spline refresh
- few caveat comments
- spline_widget::setConfig now only takes the spline as argument,
eliminating most of the complex logic there
- clarify spline::set_bundle vs newly introduced spline::recompute
Diffstat (limited to 'spline-widget/spline-widget.hpp')
-rw-r--r-- | spline-widget/spline-widget.hpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/spline-widget/spline-widget.hpp b/spline-widget/spline-widget.hpp index 9ad4f598..5fc50504 100644 --- a/spline-widget/spline-widget.hpp +++ b/spline-widget/spline-widget.hpp @@ -12,14 +12,17 @@ #include "spline.hpp" #include "api/plugin-api.hpp" #include "options/options.hpp" +using namespace options; + +#include "export.hpp" + #include <QWidget> #include <QtGui> #include <QMetaObject> #include <QPointF> #include <QDebug> -using namespace options; -class SPLINE_WIDGET_EXPORT spline_widget final : public QWidget +class OPENTRACK_SPLINE_EXPORT spline_widget final : public QWidget { Q_OBJECT Q_PROPERTY(QColor colorBezier READ colorBezier WRITE setColorBezier) @@ -31,7 +34,7 @@ public: spline* config(); - void setConfig(spline* config, bundle b); + void setConfig(spline* spl); QColor colorBezier() const { |