summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-08-27 17:06:17 +0300
committerAndrei Karas <akaras@inbox.ru>2014-08-27 17:06:17 +0300
commit6f475537cb5e12f7088a401c4fb5b583bbabc580 (patch)
tree72d3fb579463bf55382a4e2469a9838b96249fed
parente70704f2b1609b49319e34f466afaf4454d92382 (diff)
downloadplus-6f475537cb5e12f7088a401c4fb5b583bbabc580.tar.gz
plus-6f475537cb5e12f7088a401c4fb5b583bbabc580.tar.bz2
plus-6f475537cb5e12f7088a401c4fb5b583bbabc580.tar.xz
plus-6f475537cb5e12f7088a401c4fb5b583bbabc580.zip
Move boolean_options define into separate file.
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/actions/chat.cpp5
-rw-r--r--src/commands.h4
-rw-r--r--src/net/ea/gui/partytab.cpp1
-rw-r--r--src/utils/booleanoptions.h30
6 files changed, 34 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22c5f6b4d..025e243e4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -679,6 +679,7 @@ SET(SRCS
utils/translation/translationmanager.h
utils/base64.cpp
utils/base64.h
+ utils/booleanoptions.h
utils/chatutils.cpp
utils/chatutils.h
utils/checkutils.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 637522a85..20326d596 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -796,6 +796,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
utils/translation/translationmanager.h \
utils/base64.cpp \
utils/base64.h \
+ utils/booleanoptions.h \
utils/chatutils.cpp \
utils/chatutils.h \
utils/checkutils.cpp \
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 8f991dd5f..0a83c4578 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -76,6 +76,7 @@
#include "net/net.h"
#include "net/partyhandler.h"
+#include "utils/booleanoptions.h"
#include "utils/gettext.h"
#include "utils/stringutils.h"
@@ -86,10 +87,6 @@ extern std::string tradePartnerName;
extern QuitDialog *quitDialog;
extern unsigned int tmwServerVersion;
-// TRANSLATORS: chat option changed message
-#define BOOLEAN_OPTIONS _("Options to /%s are \"yes\", \"no\", \"true\", "\
-"\"false\", \"1\", \"0\".")
-
namespace Actions
{
diff --git a/src/commands.h b/src/commands.h
index 6bcdf6790..6c6c481f0 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -35,10 +35,6 @@ class ChatTab;
extern ChatTab *localChatTab;
-// TRANSLATORS: chat option changed message
-#define BOOLEAN_OPTIONS _("Options to /%s are \"yes\", \"no\", \"true\", "\
-"\"false\", \"1\", \"0\".")
-
#define decHandler(name) bool name(InputEvent &event)
struct CommandInfo final
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index dfb4b9dcc..92c0b5ca2 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -36,6 +36,7 @@
#include "gui/windows/chatwindow.h"
+#include "utils/booleanoptions.h"
#include "utils/gettext.h"
#include "debug.h"
diff --git a/src/utils/booleanoptions.h b/src/utils/booleanoptions.h
new file mode 100644
index 000000000..572949c8e
--- /dev/null
+++ b/src/utils/booleanoptions.h
@@ -0,0 +1,30 @@
+/*
+ * 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 UTILS_BOOLEANOPTIONS_H
+#define UTILS_BOOLEANOPTIONS_H
+
+#include "utils/gettext.h"
+
+// TRANSLATORS: chat option changed message
+#define BOOLEAN_OPTIONS _("Options to /%s are \"yes\", \"no\", \"true\", "\
+"\"false\", \"1\", \"0\".")
+
+#endif // UTILS_BOOLEANOPTIONS_H