diff options
Diffstat (limited to 'logic/mappings.hpp')
| -rw-r--r-- | logic/mappings.hpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/logic/mappings.hpp b/logic/mappings.hpp index 4e0f7218..be7dd3a2 100644 --- a/logic/mappings.hpp +++ b/logic/mappings.hpp @@ -9,19 +9,18 @@ #include "export.hpp" #include "options/options.hpp" -using namespace options; #include "spline/spline.hpp" #include "main-settings.hpp" struct OTR_LOGIC_EXPORT Map final { - Map(QString primary, QString secondary, int max_x, int max_y, axis_opts& opts); + Map(const QString& spline_name, const QString& alt_spline_name, axis_opts& opts); - void save(QSettings& s); + void save(); void load(); axis_opts& opts; - QString name1, name2; + QString name, alt_name; spline spline_main, spline_alt; }; @@ -30,12 +29,10 @@ class OTR_LOGIC_EXPORT Mappings final private: Map axes[6]; public: - Mappings(std::vector<axis_opts*> opts); + explicit Mappings(axis_opts** opts); Map& operator()(int i) { return axes[i]; } const Map& operator()(int i) const { return axes[i]; } - Map& operator()(unsigned i) { return axes[i]; } - const Map& operator()(unsigned i) const { return axes[i]; } template<typename f> void forall(f&& fun) { |