diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-12-17 20:38:57 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-12-17 20:38:57 +0300 |
| commit | 22f12b5d47cf35cf4196156febc68d6eb78ef3f2 (patch) | |
| tree | 55429423878e31b8a86b2bcf36547a93b7bc880f | |
| parent | b52b013d0edc3be56566aa4fb21c5cde8a8997f5 (diff) | |
| download | manaverse-22f12b5d47cf35cf4196156febc68d6eb78ef3f2.tar.gz manaverse-22f12b5d47cf35cf4196156febc68d6eb78ef3f2.tar.bz2 manaverse-22f12b5d47cf35cf4196156febc68d6eb78ef3f2.tar.xz manaverse-22f12b5d47cf35cf4196156febc68d6eb78ef3f2.zip | |
add restrict into setuptouchitem.
| -rw-r--r-- | src/gui/widgets/setuptouchitem.cpp | 30 | ||||
| -rw-r--r-- | src/gui/widgets/setuptouchitem.h | 24 |
2 files changed, 29 insertions, 25 deletions
diff --git a/src/gui/widgets/setuptouchitem.cpp b/src/gui/widgets/setuptouchitem.cpp index d8d6eda9a..58a34de45 100644 --- a/src/gui/widgets/setuptouchitem.cpp +++ b/src/gui/widgets/setuptouchitem.cpp @@ -89,12 +89,14 @@ int TouchActionsModel::getSelectionFromAction(const int action) const } -SetupActionDropDown::SetupActionDropDown(const std::string &text, - const std::string &description, - const std::string &keyName, - SetupTabScroll *const parent, - const std::string &eventName, - TouchActionsModel *const model, +SetupActionDropDown::SetupActionDropDown(const std::string &restrict text, + const std::string &restrict + description, + const std::string &restrict keyName, + SetupTabScroll *restrict const parent, + const std::string &restrict eventName, + TouchActionsModel *restrict + const model, const int width, const bool mainConfig) : SetupItem(text, description, keyName, parent, eventName, mainConfig), @@ -108,14 +110,16 @@ SetupActionDropDown::SetupActionDropDown(const std::string &text, createControls(); } -SetupActionDropDown::SetupActionDropDown(const std::string &text, - const std::string &description, - const std::string &keyName, - SetupTabScroll *const parent, - const std::string &eventName, - TouchActionsModel *const model, +SetupActionDropDown::SetupActionDropDown(const std::string &restrict text, + const std::string &restrict + description, + const std::string &restrict keyName, + SetupTabScroll *restrict const parent, + const std::string &restrict eventName, + TouchActionsModel *restrict + const model, const int width, - const std::string &def, + const std::string &restrict def, const bool mainConfig) : SetupItem(text, description, keyName, parent, eventName, def, mainConfig), mHorizont(nullptr), diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h index 285e0e02f..65ad48642 100644 --- a/src/gui/widgets/setuptouchitem.h +++ b/src/gui/widgets/setuptouchitem.h @@ -46,20 +46,20 @@ class TouchActionsModel final : public NamesModel class SetupActionDropDown final : public SetupItem { public: - SetupActionDropDown(const std::string &text, - const std::string &description, - const std::string &keyName, - SetupTabScroll *const parent, - const std::string &eventName, - TouchActionsModel *const model, + SetupActionDropDown(const std::string &restrict text, + const std::string &restrict description, + const std::string &restrict keyName, + SetupTabScroll *restrict const parent, + const std::string &restrict eventName, + TouchActionsModel *restrict const model, const int width, const bool mainConfig = true); - SetupActionDropDown(const std::string &text, - const std::string &description, - const std::string &keyName, - SetupTabScroll *const parent, - const std::string &eventName, - TouchActionsModel *const model, + SetupActionDropDown(const std::string &restrict text, + const std::string &restrict description, + const std::string &restrict keyName, + SetupTabScroll *restrict const parent, + const std::string &restrict eventName, + TouchActionsModel *restrict const model, const int width, const std::string &def, const bool mainConfig = true); |