diff options
| -rw-r--r-- | filter-accela/ftnoir_filter_accela.h | 2 | ||||
| -rw-r--r-- | filter-accela/ftnoir_filter_accela_dialog.cpp | 2 | ||||
| -rw-r--r-- | gui/curve-config.cpp | 2 | ||||
| -rw-r--r-- | gui/curve-config.h | 2 | ||||
| -rw-r--r-- | gui/mapping.ui | 2 | ||||
| -rw-r--r-- | opentrack-logic/mappings.hpp | 2 | ||||
| -rw-r--r-- | opentrack-logic/tracker.h | 2 | ||||
| -rw-r--r-- | spline-widget/spline-widget.cpp (renamed from spline-widget/qfunctionconfigurator.cpp) | 2 | ||||
| -rw-r--r-- | spline-widget/spline-widget.hpp (renamed from spline-widget/qfunctionconfigurator.h) | 2 | ||||
| -rw-r--r-- | spline-widget/spline.cpp (renamed from spline-widget/functionconfig.cpp) | 2 | ||||
| -rw-r--r-- | spline-widget/spline.hpp (renamed from spline-widget/functionconfig.h) | 0 |
11 files changed, 10 insertions, 10 deletions
diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h index da011228..7eda8c9e 100644 --- a/filter-accela/ftnoir_filter_accela.h +++ b/filter-accela/ftnoir_filter_accela.h @@ -7,7 +7,7 @@ #pragma once #include "ui_ftnoir_accela_filtercontrols.h" #include "opentrack/plugin-api.hpp" -#include "spline-widget/functionconfig.h" +#include "spline-widget/spline.hpp" #include <atomic> #include <QMutex> #include <QTimer> diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp index ddccc2a7..7d257711 100644 --- a/filter-accela/ftnoir_filter_accela_dialog.cpp +++ b/filter-accela/ftnoir_filter_accela_dialog.cpp @@ -10,7 +10,7 @@ #include <algorithm> #include <QDoubleSpinBox> #include "opentrack/plugin-api.hpp" -#include "spline-widget/qfunctionconfigurator.h" +#include "spline-widget/spline-widget.hpp" #include <QDialog> FilterControls::FilterControls() : diff --git a/gui/curve-config.cpp b/gui/curve-config.cpp index 07564ffa..3e262c48 100644 --- a/gui/curve-config.cpp +++ b/gui/curve-config.cpp @@ -8,6 +8,7 @@ #include "curve-config.h" #include "opentrack-logic/main-settings.hpp" +#include "spline-widget/spline-widget.hpp" MapWidget::MapWidget(Mappings& m) : m(m) { @@ -17,7 +18,6 @@ MapWidget::MapWidget(Mappings& m) : reload(); - setFont(qApp->font()); connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK())); connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); diff --git a/gui/curve-config.h b/gui/curve-config.h index f13e5501..2124aa81 100644 --- a/gui/curve-config.h +++ b/gui/curve-config.h @@ -3,7 +3,7 @@ #include "opentrack-logic/mappings.hpp" #include "ui_mapping.h" -class MapWidget: public QWidget +class MapWidget final : public QWidget { Q_OBJECT public: diff --git a/gui/mapping.ui b/gui/mapping.ui index c0966909..3e3a54ff 100644 --- a/gui/mapping.ui +++ b/gui/mapping.ui @@ -383,7 +383,7 @@ <customwidget> <class>QFunctionConfigurator</class> <extends>QWidget</extends> - <header>spline-widget/qfunctionconfigurator.h</header> + <header>spline-widget/spline-widget.hpp</header> </customwidget> </customwidgets> <tabstops> diff --git a/opentrack-logic/mappings.hpp b/opentrack-logic/mappings.hpp index 8e7d3b35..9475ecb4 100644 --- a/opentrack-logic/mappings.hpp +++ b/opentrack-logic/mappings.hpp @@ -10,7 +10,7 @@ #include <QSettings> #include "opentrack-compat/options.hpp" using namespace options; -#include "spline-widget/functionconfig.h" +#include "spline-widget/spline.hpp" #include "main-settings.hpp" class Mapping { diff --git a/opentrack-logic/tracker.h b/opentrack-logic/tracker.h index 58b478bb..91ac3f2f 100644 --- a/opentrack-logic/tracker.h +++ b/opentrack-logic/tracker.h @@ -17,7 +17,7 @@ #include "simple-mat.hpp" #include "selected-libraries.hpp" -#include "spline-widget/functionconfig.h" +#include "spline-widget/spline.hpp" #include "main-settings.hpp" #include "opentrack-compat/options.hpp" #include "tracklogger.hpp" diff --git a/spline-widget/qfunctionconfigurator.cpp b/spline-widget/spline-widget.cpp index 6f08389f..ee2e3c73 100644 --- a/spline-widget/qfunctionconfigurator.cpp +++ b/spline-widget/spline-widget.cpp @@ -7,7 +7,7 @@ #include "opentrack-compat/options.hpp" using namespace options; -#include "spline-widget/qfunctionconfigurator.h" +#include "spline-widget.hpp" #include <QPainter> #include <QPaintEvent> #include <QPen> diff --git a/spline-widget/qfunctionconfigurator.h b/spline-widget/spline-widget.hpp index b1cf7afc..cc416b60 100644 --- a/spline-widget/qfunctionconfigurator.h +++ b/spline-widget/spline-widget.hpp @@ -12,7 +12,7 @@ #include <QWidget> #include <QtGui> #include <QPointF> -#include "functionconfig.h" +#include "spline.hpp" #include "opentrack/plugin-api.hpp" class SPLINE_WIDGET_EXPORT QFunctionConfigurator : public QWidget diff --git a/spline-widget/functionconfig.cpp b/spline-widget/spline.cpp index 2ac725f6..7bac6b78 100644 --- a/spline-widget/functionconfig.cpp +++ b/spline-widget/spline.cpp @@ -6,7 +6,7 @@ * notice appear in all copies. */ -#include "functionconfig.h" +#include "spline.hpp" #include <QMutexLocker> #include <QCoreApplication> #include <QPointF> diff --git a/spline-widget/functionconfig.h b/spline-widget/spline.hpp index 5d83aefd..5d83aefd 100644 --- a/spline-widget/functionconfig.h +++ b/spline-widget/spline.hpp |