modules: make names unique

4 files changed, 21 insertions, 21 deletions

diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui
index 5509bd3f..4ed91099 100644
--- a/filter-accela/ftnoir_accela_filtercontrols.ui
+++ b/filter-accela/ftnoir_accela_filtercontrols.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AccelaUICFilterControls</class>
- <widget class="QWidget" name="AccelaUICFilterControls">
+ <class>AccelaUICdialog_accela</class>
+ <widget class="QWidget" name="AccelaUICdialog_accela">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/filter-accela/ftnoir_filter_accela.cpp b/filter-accela/ftnoir_filter_accela.cpp
index c0f355a4..4fec74b2 100644
--- a/filter-accela/ftnoir_filter_accela.cpp
+++ b/filter-accela/ftnoir_filter_accela.cpp
@@ -14,12 +14,12 @@
 constexpr double settings_accela::rot_gains[16][2];
 constexpr double settings_accela::trans_gains[16][2];
 
-FTNoIR_Filter::FTNoIR_Filter() : first_run(true)
+accela::accela() : first_run(true)
 {
     s.make_splines(rot, trans);
 }
 
-void FTNoIR_Filter::filter(const double* input, double *output)
+void accela::filter(const double* input, double *output)
 {
     if (first_run)
     {
@@ -96,5 +96,5 @@ void settings_accela::make_splines(spline& rot, spline& trans)
         trans.addPoint(QPointF(trans_gains[i][0], trans_gains[i][1]));
 }
 
-OPENTRACK_DECLARE_FILTER(FTNoIR_Filter, FilterControls, FTNoIR_FilterDll)
+OPENTRACK_DECLARE_FILTER(accela, dialog_accela, accelaDll)
 
diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h
index d03dd155..67cba49e 100644
--- a/filter-accela/ftnoir_filter_accela.h
+++ b/filter-accela/ftnoir_filter_accela.h
@@ -14,10 +14,10 @@
 #include <QMutex>
 #include <QTimer>
 
-class FTNoIR_Filter : public IFilter
+class accela : public IFilter
 {
 public:
-    FTNoIR_Filter();
+    accela();
     void filter(const double* input, double *output) override;
     void center() override { first_run = true; }
     spline rot, trans;
@@ -35,15 +35,15 @@ private:
     }
 };
 
-class FilterControls: public IFilterDialog
+class dialog_accela: public IFilterDialog
 {
     Q_OBJECT
 public:
-    FilterControls();
+    dialog_accela();
     void register_filter(IFilter*) override {}
     void unregister_filter() override {}
 private:
-    Ui::AccelaUICFilterControls ui;
+    Ui::AccelaUICdialog_accela ui;
     void save();
     settings_accela s;
 private slots:
@@ -57,7 +57,7 @@ private slots:
     void update_rot_nl_slider(const slider_value& sl);
 };
 
-class FTNoIR_FilterDll : public Metadata
+class accelaDll : public Metadata
 {
 public:
     QString name() { return QString("Accela"); }
diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp
index c8262dd5..79db1ffa 100644
--- a/filter-accela/ftnoir_filter_accela_dialog.cpp
+++ b/filter-accela/ftnoir_filter_accela_dialog.cpp
@@ -13,7 +13,7 @@
 #include "spline-widget/spline-widget.hpp"
 #include <QDialog>
 
-FilterControls::FilterControls()
+dialog_accela::dialog_accela()
 {
     ui.setupUi(this);
 
@@ -70,18 +70,18 @@ FilterControls::FilterControls()
     }
 }
 
-void FilterControls::doOK()
+void dialog_accela::doOK()
 {
     save();
     close();
 }
 
-void FilterControls::doCancel()
+void dialog_accela::doCancel()
 {
     close();
 }
 
-void FilterControls::save()
+void dialog_accela::save()
 {
     s.b->save();
 }
@@ -89,34 +89,34 @@ void FilterControls::save()
 #define FIELD(x, a) ((a).arg(((x).cur()), 0, 'g', 4))
 #define LIT(x) QStringLiteral(x)
 
-void FilterControls::update_rot_display(const slider_value& val)
+void dialog_accela::update_rot_display(const slider_value& val)
 {
     static const QString str(QString::fromUtf8("%1°"));
     ui.rot_gain->setText(FIELD(val, str));
 }
 
-void FilterControls::update_trans_display(const slider_value& val)
+void dialog_accela::update_trans_display(const slider_value& val)
 {
     ui.trans_gain->setText(FIELD(val, LIT("%1mm")));
 }
 
-void FilterControls::update_ewma_display(const slider_value& val)
+void dialog_accela::update_ewma_display(const slider_value& val)
 {
     ui.ewma_label->setText(FIELD(val, LIT("%1ms")));
 }
 
-void FilterControls::update_rot_dz_display(const slider_value& val)
+void dialog_accela::update_rot_dz_display(const slider_value& val)
 {
     static const QString str(QString::fromUtf8("%1°"));
     ui.rot_dz->setText(FIELD(val, str));
 }
 
-void FilterControls::update_trans_dz_display(const slider_value& val)
+void dialog_accela::update_trans_dz_display(const slider_value& val)
 {
     ui.trans_dz->setText(FIELD(val, LIT("%1mm")));
 }
 
-void FilterControls::update_rot_nl_slider(const slider_value& val)
+void dialog_accela::update_rot_nl_slider(const slider_value& val)
 {
     ui.rot_nl->setText(FIELD(val, LIT(
                         "<html><head/><body>"