Move touchactiondata into separate file.

7 files changed, 67 insertions, 11 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d59f6fed8..64eefa3a2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -469,6 +469,8 @@ SET(SRCS
     gui/theme.cpp
     gui/theme.h
     gui/themeinfo.h
+    gui/touchactiondata.cpp
+    gui/touchactiondata.h
     gui/windows/tradewindow.cpp
     gui/windows/tradewindow.h
     gui/windows/unregisterdialog.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 3d27a9691..55a5c4953 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -593,6 +593,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/theme.cpp \
 	      gui/theme.h \
 	      gui/themeinfo.h \
+	      gui/touchactiondata.cpp \
+	      gui/touchactiondata.h \
 	      gui/windows/tradewindow.cpp \
 	      gui/windows/tradewindow.h \
 	      gui/windows/unregisterdialog.cpp \
diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp
index b32d1479f..248459361 100644
--- a/src/gui/models/touchactionmodel.cpp
+++ b/src/gui/models/touchactionmodel.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "gui/setupactiondata.h"
+#include "gui/touchactiondata.h"
 
 #include "gui/models/touchactionmodel.h"
 
diff --git a/src/gui/setupactiondata.cpp b/src/gui/setupactiondata.cpp
index 03868a88e..0cf9da6a0 100644
--- a/src/gui/setupactiondata.cpp
+++ b/src/gui/setupactiondata.cpp
@@ -1992,11 +1992,3 @@ SetupActionData setupActionData8[] =
         ""
     }
 };
-
-SetupActionData *const touchActionData[] =
-{
-    setupActionData0,
-    setupActionData2,
-    setupActionData5,
-    setupActionData6
-};
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index cd68a9f70..f2a36d4ea 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -45,9 +45,6 @@ struct SetupActionData final
     std::string text;
 };
 
-const int touchActionDataSize = 4;
-extern SetupActionData *const touchActionData[];
-
 extern SetupActionData setupActionData0[];
 extern SetupActionData setupActionData1[];
 extern SetupActionData setupActionData2[];
diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp
new file mode 100644
index 000000000..05c4a5cd9
--- /dev/null
+++ b/src/gui/touchactiondata.cpp
@@ -0,0 +1,33 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-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/>.
+ */
+
+#include "gui/touchactiondata.h"
+
+#include "gui/setupactiondata.h"
+
+#include "debug.h"
+
+SetupActionData *const touchActionData[] =
+{
+    setupActionData0,
+    setupActionData2,
+    setupActionData5,
+    setupActionData6
+};
diff --git a/src/gui/touchactiondata.h b/src/gui/touchactiondata.h
new file mode 100644
index 000000000..9f80e05f6
--- /dev/null
+++ b/src/gui/touchactiondata.h
@@ -0,0 +1,29 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2011-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_TOUCHACTIONDATA_H
+#define GUI_TOUCHACTIONDATA_H
+
+struct SetupActionData;
+
+const int touchActionDataSize = 4;
+extern SetupActionData *const touchActionData[];
+
+#endif  // GUI_TOUCHACTIONDATA_H