diff options
| -rw-r--r-- | ftnoir_filter_accela/ftnoir_filter_accela.h | 4 | ||||
| -rw-r--r-- | ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp | 4 | ||||
| -rw-r--r-- | ftnoir_filter_ewma2/ftnoir_filter_ewma2.h | 4 | ||||
| -rw-r--r-- | ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp | 4 | ||||
| -rwxr-xr-x | ftnoir_filter_kalman/ftnoir_filter_kalman.h | 4 | ||||
| -rw-r--r-- | opentrack/plugin-qt-api.hpp | 16 | 
6 files changed, 18 insertions, 18 deletions
diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.h b/ftnoir_filter_accela/ftnoir_filter_accela.h index ec78dd4f..b5d0995c 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela.h +++ b/ftnoir_filter_accela/ftnoir_filter_accela.h @@ -55,8 +55,8 @@ class FilterControls: public IFilterDialog      Q_OBJECT  public:      FilterControls(); -    void registerFilter(IFilter* filter); -    void unregisterFilter(); +    void register_filter(IFilter* filter); +    void unregister_filter();  private:      Ui::AccelaUICFilterControls ui;      void discard(); diff --git a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp index 69348a7f..3a4aaf05 100644 --- a/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp +++ b/ftnoir_filter_accela/ftnoir_filter_accela_dialog.cpp @@ -21,12 +21,12 @@ FilterControls::FilterControls() :      tie_setting(s.expt, ui.expt);  } -void FilterControls::registerFilter(IFilter* filter) +void FilterControls::register_filter(IFilter* filter)  {      accela_filter = (FTNoIR_Filter*) filter;  } -void FilterControls::unregisterFilter() +void FilterControls::unregister_filter()  {      accela_filter = NULL;  } diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h index ff8c40a9..0388c5f0 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2.h @@ -43,8 +43,8 @@ class FilterControls: public IFilterDialog      Q_OBJECT  public:      FilterControls(); -    void registerFilter(IFilter* flt); -    void unregisterFilter(); +    void register_filter(IFilter* flt); +    void unregister_filter();  private:      Ui::UICFilterControls ui; diff --git a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp index 462cca3f..228bc086 100644 --- a/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp +++ b/ftnoir_filter_ewma2/ftnoir_filter_ewma2_dialog.cpp @@ -16,12 +16,12 @@ FilterControls::FilterControls() : pFilter(NULL)      tie_setting(s.kSmoothingScaleCurve, ui.powCurve);  } -void FilterControls::registerFilter(IFilter* flt) +void FilterControls::register_filter(IFilter* flt)  {      pFilter = (FTNoIR_Filter*) flt;  } -void FilterControls::unregisterFilter() +void FilterControls::unregister_filter()  {      pFilter = NULL;  } diff --git a/ftnoir_filter_kalman/ftnoir_filter_kalman.h b/ftnoir_filter_kalman/ftnoir_filter_kalman.h index bb1c2b98..c2947516 100755 --- a/ftnoir_filter_kalman/ftnoir_filter_kalman.h +++ b/ftnoir_filter_kalman/ftnoir_filter_kalman.h @@ -51,8 +51,8 @@ public:          show();      }      Ui::KalmanUICFilterControls ui; -    void registerFilter(IFilter*) override {} -    void unregisterFilter() override {} +    void register_filter(IFilter*) override {} +    void unregister_filter() override {}  public slots:      void doOK();      void doCancel(); diff --git a/opentrack/plugin-qt-api.hpp b/opentrack/plugin-qt-api.hpp index a2aa0d19..6fcea4f5 100644 --- a/opentrack/plugin-qt-api.hpp +++ b/opentrack/plugin-qt-api.hpp @@ -9,7 +9,7 @@ struct Metadata  public:      virtual QString name() = 0;      virtual QIcon icon() = 0; -    virtual ~Metadata() {}; +    virtual ~Metadata() {}  };  // XXX TODO get rid of QString/QFrame to fix ABI woes @@ -20,23 +20,23 @@ public:  struct IFilter  {  public: -    virtual ~IFilter() {}; +    virtual ~IFilter() {}      virtual void filter(const double *target_camera_position, double *new_camera_position) = 0;  };  struct IFilterDialog : public QWidget  {      virtual ~IFilterDialog() {} -    virtual void registerFilter(IFilter* tracker) = 0; -    virtual void unregisterFilter() = 0; +    virtual void register_filter(IFilter* filter) = 0; +    virtual void unregister_filter() = 0;  };  struct IProtocol  {  public: -    virtual ~IProtocol() {}; +    virtual ~IProtocol() {}      virtual bool correct() = 0; -    virtual void pose( const double* headpose ) = 0; +    virtual void pose(const double* headpose) = 0;      virtual QString game_name() = 0;  }; @@ -50,8 +50,8 @@ struct IProtocolDialog : public QWidget  struct ITracker  {  public: -    virtual ~ITracker() {}; -    virtual void start_tracker( QFrame* frame ) = 0; +    virtual ~ITracker() {} +    virtual void start_tracker(QFrame* frame) = 0;      virtual void data(double *data) = 0;  };  | 
