Move setup input pages options into separate file.

8 files changed, 48 insertions, 12 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 64eefa3a2..f2e6667d8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -436,10 +436,11 @@ SET(SRCS
     gui/widgets/tabs/setup_video.h
     gui/widgets/tabs/setup_visual.cpp
     gui/widgets/tabs/setup_visual.h
-    gui/setupactiondata.cpp
     gui/setupactiondata.h
     gui/setupinputpages.cpp
     gui/setupinputpages.h
+    input/pages/pages.cpp
+    input/pages/pages.h
     gui/fonts/font.cpp
     gui/fonts/font.h
     gui/fonts/textchunk.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 55a5c4953..19e13af04 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -560,10 +560,11 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      gui/widgets/tabs/setup_video.h \
 	      gui/widgets/tabs/setup_visual.cpp \
 	      gui/widgets/tabs/setup_visual.h \
-	      gui/setupactiondata.cpp \
 	      gui/setupactiondata.h \
 	      gui/setupinputpages.cpp \
 	      gui/setupinputpages.h \
+	      input/pages/pages.cpp \
+	      input/pages/pages.h \
 	      gui/fonts/font.cpp \
 	      gui/fonts/font.h \
 	      gui/fonts/textchunk.cpp \
diff --git a/src/gui/setupactiondata.h b/src/gui/setupactiondata.h
index f2a36d4ea..e92ab3ff1 100644
--- a/src/gui/setupactiondata.h
+++ b/src/gui/setupactiondata.h
@@ -45,14 +45,4 @@ struct SetupActionData final
     std::string text;
 };
 
-extern SetupActionData setupActionData0[];
-extern SetupActionData setupActionData1[];
-extern SetupActionData setupActionData2[];
-extern SetupActionData setupActionData3[];
-extern SetupActionData setupActionData4[];
-extern SetupActionData setupActionData5[];
-extern SetupActionData setupActionData6[];
-extern SetupActionData setupActionData7[];
-extern SetupActionData setupActionData8[];
-
 #endif  // GUI_SETUPACTIONDATA_H
diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp
index 5e99c1384..67615aa1a 100644
--- a/src/gui/setupinputpages.cpp
+++ b/src/gui/setupinputpages.cpp
@@ -27,6 +27,8 @@
 
 #include "utils/gettext.h"
 
+#include "input/pages/pages.h"
+
 #include "debug.h"
 
 const char *const pages[] =
diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp
index 05c4a5cd9..6d6be78a6 100644
--- a/src/gui/touchactiondata.cpp
+++ b/src/gui/touchactiondata.cpp
@@ -22,6 +22,8 @@
 
 #include "gui/setupactiondata.h"
 
+#include "input/pages/pages.h"
+
 #include "debug.h"
 
 SetupActionData *const touchActionData[] =
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index a4080a626..39d944a87 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -27,6 +27,7 @@
 
 #include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
+#include "input/pages/pages.h"
 
 #include "gui/gui.h"
 #include "gui/setupinputpages.h"
diff --git a/src/gui/setupactiondata.cpp b/src/input/pages/pages.cpp
index 0cf9da6a0..0cf9da6a0 100644
--- a/src/gui/setupactiondata.cpp
+++ b/src/input/pages/pages.cpp
diff --git a/src/input/pages/pages.h b/src/input/pages/pages.h
new file mode 100644
index 000000000..626df6d54
--- /dev/null
+++ b/src/input/pages/pages.h
@@ -0,0 +1,39 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2007  Joshua Langley <joshlangley@optusnet.com.au>
+ *  Copyright (C) 2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  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 INPUT_PAGES_PAGES_H
+#define INPUT_PAGES_PAGES_H
+
+#include "gui/setupactiondata.h"
+
+extern SetupActionData setupActionData0[];
+extern SetupActionData setupActionData1[];
+extern SetupActionData setupActionData2[];
+extern SetupActionData setupActionData3[];
+extern SetupActionData setupActionData4[];
+extern SetupActionData setupActionData5[];
+extern SetupActionData setupActionData6[];
+extern SetupActionData setupActionData7[];
+extern SetupActionData setupActionData8[];
+
+#endif  // INPUT_PAGES_PAGES_H