diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-02-22 19:28:24 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-02-22 19:28:24 +0300 |
commit | a21e7a1004f8c4b135451929bdd7fbb57ee55910 (patch) | |
tree | 26c0f30231f6244d08d0dae8b3ac9ee360b33105 /src/gui/widgets | |
parent | 7898171f05a06df0541031d7491127493947c939 (diff) | |
download | manaplus-a21e7a1004f8c4b135451929bdd7fbb57ee55910.tar.gz manaplus-a21e7a1004f8c4b135451929bdd7fbb57ee55910.tar.bz2 manaplus-a21e7a1004f8c4b135451929bdd7fbb57ee55910.tar.xz manaplus-a21e7a1004f8c4b135451929bdd7fbb57ee55910.zip |
fix touchactionmodel.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/setuptouchitem.cpp | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp index c620686fd..99a774ecd 100644 --- a/src/gui/widgets/setuptouchitem.cpp +++ b/src/gui/widgets/setuptouchitem.cpp @@ -35,64 +35,6 @@ #include "debug.h" -static class SortTouchActionFunctor final -{ - public: - bool operator() (const SetupActionData *const data1, - const SetupActionData *const data2) const - { - if (!data1 || !data2) - return false; - return data1->name < data2->name; - } -} touchActionSorter; - -TouchActionsModel::TouchActionsModel() : - NamesModel(), - mActionId(), - mActionToSelection() -{ - std::vector<SetupActionData*> data; - - for (int f = 0, sz = touchActionDataSize; f < sz; f ++) - { - int k = 0; - while (!touchActionData[f][k].name.empty()) - { - data.push_back(&touchActionData[f][k]); - k ++; - } - } - - std::sort(data.begin(), data.end(), touchActionSorter); - int cnt = 0; - FOR_EACH (std::vector<SetupActionData*>::iterator, it, data) - { - const SetupActionData *const data1 = *it; - mNames.push_back(data1->name); - mActionId.push_back(data1->actionId); - mActionToSelection[data1->actionId] = cnt; - cnt ++; - } -} - -int TouchActionsModel::getActionFromSelection(const int sel) const -{ - if (sel < 0 || sel > static_cast<signed int>(mActionId.size())) - return -1; - return mActionId[sel]; -} - -int TouchActionsModel::getSelectionFromAction(const int action) const -{ - const std::map<int, int>::const_iterator it - = mActionToSelection.find(action); - if (it == mActionToSelection.end()) - return 0; - return (*it).second; -} - - SetupActionDropDown::SetupActionDropDown(const std::string &restrict text, const std::string &restrict description, |