diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 17:36:25 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 17:36:25 +0300 |
commit | 792ea379274005afc321cbb4ba26b9e79b51f0eb (patch) | |
tree | 380a2a134c06c156fbf95db0d5ed32c35d3ccd25 /src/gui/widgets | |
parent | 32bc15a1d1aee30f5a259b1648f8d82a5e837ff7 (diff) | |
download | manaplus-792ea379274005afc321cbb4ba26b9e79b51f0eb.tar.gz manaplus-792ea379274005afc321cbb4ba26b9e79b51f0eb.tar.bz2 manaplus-792ea379274005afc321cbb4ba26b9e79b51f0eb.tar.xz manaplus-792ea379274005afc321cbb4ba26b9e79b51f0eb.zip |
Move touchactionmodel into gui/models.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/setuptouchitem.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/setuptouchitem.h | 19 | ||||
-rw-r--r-- | src/gui/widgets/tabs/setup_touch.cpp | 1 |
3 files changed, 4 insertions, 18 deletions
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp index d50af8ff3..c620686fd 100644 --- a/src/gui/widgets/setuptouchitem.cpp +++ b/src/gui/widgets/setuptouchitem.cpp @@ -22,6 +22,8 @@ #include "gui/setupactiondata.h" +#include "gui/models/touchactionmodel.h" + #include "gui/widgets/dropdown.h" #include "gui/widgets/horizontcontainer.h" #include "gui/widgets/label.h" diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h index b84b15f81..2c1aa05d0 100644 --- a/src/gui/widgets/setuptouchitem.h +++ b/src/gui/widgets/setuptouchitem.h @@ -25,24 +25,7 @@ #include "gui/widgets/setupitem.h" -class TouchActionsModel final : public NamesModel -{ - public: - TouchActionsModel(); - - A_DELETE_COPY(TouchActionsModel) - - ~TouchActionsModel() - { } - - int getActionFromSelection(const int sel) const; - - int getSelectionFromAction(const int action) const; - - private: - std::vector<int> mActionId; - std::map<int, int> mActionToSelection; -}; +class TouchActionsModel; class SetupActionDropDown final : public SetupItem { diff --git a/src/gui/widgets/tabs/setup_touch.cpp b/src/gui/widgets/tabs/setup_touch.cpp index e26716973..d141691d4 100644 --- a/src/gui/widgets/tabs/setup_touch.cpp +++ b/src/gui/widgets/tabs/setup_touch.cpp @@ -21,6 +21,7 @@ #include "gui/widgets/tabs/setup_touch.h" #include "gui/models/namesmodel.h" +#include "gui/models/touchactionmodel.h" #include "gui/widgets/layouthelper.h" #include "gui/widgets/setuptouchitem.h" |