summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-13 23:38:08 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-13 23:38:08 +0300
commit95445bb5a7fa0c61e489d2f518cd3ebfd35c4fba (patch)
tree7974d0661683a329135920e813dcb5952ddf4375
parent1ae48312fe346dc8cd084f60840ff70972d2d384 (diff)
downloadmanaplus-95445bb5a7fa0c61e489d2f518cd3ebfd35c4fba.tar.gz
manaplus-95445bb5a7fa0c61e489d2f518cd3ebfd35c4fba.tar.bz2
manaplus-95445bb5a7fa0c61e489d2f518cd3ebfd35c4fba.tar.xz
manaplus-95445bb5a7fa0c61e489d2f518cd3ebfd35c4fba.zip
Move guiconfiglistener into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/gui.cpp28
-rw-r--r--src/listeners/guiconfiglistener.h56
4 files changed, 59 insertions, 27 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f3f37cd0d..3e3873c7e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -838,6 +838,7 @@ SET(SRCS
listeners/errorlistener.h
events/event.h
listeners/focuslistener.h
+ listeners/guiconfiglistener.h
listeners/inventorylistener.h
events/inputguievent.h
input/key.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 630fbb278..193cca732 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -161,6 +161,7 @@ manaplus_SOURCES += events/actionevent.h \
listeners/errorlistener.h \
events/event.h \
listeners/focuslistener.h \
+ listeners/guiconfiglistener.h \
listeners/inventorylistener.h \
render/graphics.h \
events/inputguievent.h \
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 7c17b5991..2841a5369 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -82,6 +82,7 @@
#include "events/keyevent.h"
#include "listeners/focuslistener.h"
+#include "listeners/guiconfiglistener.h"
#include "listeners/keylistener.h"
#include "listeners/mouselistener.h"
@@ -108,33 +109,6 @@ SDLInput *guiInput = nullptr;
// Bolded font
Font *boldFont = nullptr;
-class GuiConfigListener final : public ConfigListener
-{
- public:
- explicit GuiConfigListener(Gui *const g):
- mGui(g)
- {}
-
- A_DELETE_COPY(GuiConfigListener)
-
- virtual ~GuiConfigListener()
- {
- CHECKLISTENERS
- }
-
- void optionChanged(const std::string &name)
- {
- if (!mGui)
- return;
- if (name == "customcursor")
- mGui->setUseCustomCursor(config.getBoolValue("customcursor"));
- else if (name == "doubleClick")
- mGui->setDoubleClick(config.getBoolValue("doubleClick"));
- }
- private:
- Gui *mGui;
-};
-
Gui::Gui() :
mTop(nullptr),
mGraphics(nullptr),
diff --git a/src/listeners/guiconfiglistener.h b/src/listeners/guiconfiglistener.h
new file mode 100644
index 000000000..cd0f8f578
--- /dev/null
+++ b/src/listeners/guiconfiglistener.h
@@ -0,0 +1,56 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-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/>.
+ */
+
+#include "configuration.h"
+
+#include "gui/gui.h"
+
+#include "listeners/configlistener.h"
+
+#include "localconsts.h"
+
+class GuiConfigListener final : public ConfigListener
+{
+ public:
+ explicit GuiConfigListener(Gui *const g):
+ mGui(g)
+ {}
+
+ A_DELETE_COPY(GuiConfigListener)
+
+ virtual ~GuiConfigListener()
+ {
+ CHECKLISTENERS
+ }
+
+ void optionChanged(const std::string &name)
+ {
+ if (!mGui)
+ return;
+ if (name == "customcursor")
+ mGui->setUseCustomCursor(config.getBoolValue("customcursor"));
+ else if (name == "doubleClick")
+ mGui->setDoubleClick(config.getBoolValue("doubleClick"));
+ }
+ private:
+ Gui *mGui;
+};