summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-22 17:36:25 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-22 17:36:25 +0300
commit792ea379274005afc321cbb4ba26b9e79b51f0eb (patch)
tree380a2a134c06c156fbf95db0d5ed32c35d3ccd25
parent32bc15a1d1aee30f5a259b1648f8d82a5e837ff7 (diff)
downloadplus-792ea379274005afc321cbb4ba26b9e79b51f0eb.tar.gz
plus-792ea379274005afc321cbb4ba26b9e79b51f0eb.tar.bz2
plus-792ea379274005afc321cbb4ba26b9e79b51f0eb.tar.xz
plus-792ea379274005afc321cbb4ba26b9e79b51f0eb.zip
Move touchactionmodel into gui/models.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/models/touchactionmodel.h47
-rw-r--r--src/gui/widgets/setuptouchitem.cpp2
-rw-r--r--src/gui/widgets/setuptouchitem.h19
-rw-r--r--src/gui/widgets/tabs/setup_touch.cpp1
6 files changed, 53 insertions, 18 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b80e13a93..297713e72 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -228,6 +228,7 @@ SET(SRCS
gui/widgets/guitable.h
gui/models/tablemodel.cpp
gui/models/tablemodel.h
+ gui/models/touchactionmodel.h
gui/widgets/tabstrip.cpp
gui/widgets/tabstrip.h
gui/widgets/textbox.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index c57e4eb74..ebfb1c59f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -324,6 +324,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/tabbedarea.h \
gui/models/tablemodel.cpp \
gui/models/tablemodel.h \
+ gui/models/touchactionmodel.h \
gui/widgets/tabstrip.cpp \
gui/widgets/tabstrip.h \
gui/widgets/textbox.cpp \
diff --git a/src/gui/models/touchactionmodel.h b/src/gui/models/touchactionmodel.h
new file mode 100644
index 000000000..00abe89e2
--- /dev/null
+++ b/src/gui/models/touchactionmodel.h
@@ -0,0 +1,47 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_MODELS_TOUCHACTIONMODEL_H
+#define GUI_MODELS_TOUCHACTIONMODEL_H
+
+#include "gui/models/namesmodel.h"
+
+#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;
+};
+
+#endif // GUI_MODELS_TOUCHACTIONMODEL_H
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"