summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-23 00:03:48 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-23 00:03:48 +0300
commit0eeab6d661f978e1557c63a67bfbe8c06a3fdb85 (patch)
tree2101bdada28ed5623fdd7e8262536f24f39a4c5f
parent859b5eea1557debd49f3c82a0a302216812a3b27 (diff)
downloadManaVerse-0eeab6d661f978e1557c63a67bfbe8c06a3fdb85.tar.gz
ManaVerse-0eeab6d661f978e1557c63a67bfbe8c06a3fdb85.tar.bz2
ManaVerse-0eeab6d661f978e1557c63a67bfbe8c06a3fdb85.tar.xz
ManaVerse-0eeab6d661f978e1557c63a67bfbe8c06a3fdb85.zip
Rename settings options file from page into gui.
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.am4
-rw-r--r--src/gui/setupinputpages.cpp2
-rw-r--r--src/gui/touchactiondata.cpp2
-rw-r--r--src/gui/widgets/tabs/setup_input.cpp2
-rw-r--r--src/input/pages/gui.cpp (renamed from src/input/pages/pages.cpp)0
-rw-r--r--src/input/pages/gui.h (renamed from src/input/pages/pages.h)6
7 files changed, 10 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 980691e95..b9ccf86ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -445,14 +445,14 @@ SET(SRCS
input/pages/chat.h
input/pages/emotes.cpp
input/pages/emotes.h
+ input/pages/gui.cpp
+ input/pages/gui.h
input/pages/move.cpp
input/pages/move.h
input/pages/other.cpp
input/pages/other.h
input/pages/outfits.cpp
input/pages/outfits.h
- input/pages/pages.cpp
- input/pages/pages.h
input/pages/shortcuts.cpp
input/pages/shortcuts.h
input/pages/windows.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 28d41afc6..1990e3c46 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -569,14 +569,14 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
input/pages/chat.h \
input/pages/emotes.cpp \
input/pages/emotes.h \
+ input/pages/gui.cpp \
+ input/pages/gui.h \
input/pages/move.cpp \
input/pages/move.h \
input/pages/other.cpp \
input/pages/other.h \
input/pages/outfits.cpp \
input/pages/outfits.h \
- input/pages/pages.cpp \
- input/pages/pages.h \
input/pages/shortcuts.cpp \
input/pages/shortcuts.h \
input/pages/windows.cpp \
diff --git a/src/gui/setupinputpages.cpp b/src/gui/setupinputpages.cpp
index e9f3da1e9..d4674a702 100644
--- a/src/gui/setupinputpages.cpp
+++ b/src/gui/setupinputpages.cpp
@@ -30,10 +30,10 @@
#include "input/pages/basic.h"
#include "input/pages/chat.h"
#include "input/pages/emotes.h"
+#include "input/pages/gui.h"
#include "input/pages/move.h"
#include "input/pages/other.h"
#include "input/pages/outfits.h"
-#include "input/pages/pages.h"
#include "input/pages/shortcuts.h"
#include "input/pages/windows.h"
diff --git a/src/gui/touchactiondata.cpp b/src/gui/touchactiondata.cpp
index e27add153..2f970eaf8 100644
--- a/src/gui/touchactiondata.cpp
+++ b/src/gui/touchactiondata.cpp
@@ -24,8 +24,8 @@
#include "input/pages/basic.h"
#include "input/pages/chat.h"
+#include "input/pages/gui.h"
#include "input/pages/other.h"
-#include "input/pages/pages.h"
#include "input/pages/windows.h"
#include "debug.h"
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 7710b5f8c..5185ad4eb 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -29,9 +29,9 @@
#include "input/keyboardconfig.h"
#include "input/pages/emotes.h"
+#include "input/pages/gui.h"
#include "input/pages/move.h"
#include "input/pages/outfits.h"
-#include "input/pages/pages.h"
#include "input/pages/shortcuts.h"
#include "gui/gui.h"
diff --git a/src/input/pages/pages.cpp b/src/input/pages/gui.cpp
index 2c9fbd698..2c9fbd698 100644
--- a/src/input/pages/pages.cpp
+++ b/src/input/pages/gui.cpp
diff --git a/src/input/pages/pages.h b/src/input/pages/gui.h
index 7eb59c69f..ed5e5c8da 100644
--- a/src/input/pages/pages.h
+++ b/src/input/pages/gui.h
@@ -21,11 +21,11 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef INPUT_PAGES_PAGES_H
-#define INPUT_PAGES_PAGES_H
+#ifndef INPUT_PAGES_GUI_H
+#define INPUT_PAGES_GUI_H
#include "gui/setupactiondata.h"
extern SetupActionData setupActionDataGui[];
-#endif // INPUT_PAGES_PAGES_H
+#endif // INPUT_PAGES_GUI_H