summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-06-26 16:26:55 +0300
committerAndrei Karas <akaras@inbox.ru>2017-06-26 16:26:55 +0300
commitef6a173d875114f31509823541c972667d987f87 (patch)
treed646abf1ef4c82e0cdaeed1627d058cc2bd14a70
parent01ca306dc4c227438b4cc1ed2ad5d2fba5e4a1d3 (diff)
downloadplus-ef6a173d875114f31509823541c972667d987f87.tar.gz
plus-ef6a173d875114f31509823541c972667d987f87.tar.bz2
plus-ef6a173d875114f31509823541c972667d987f87.tar.xz
plus-ef6a173d875114f31509823541c972667d987f87.zip
Move define readColor from browserbox.cpp/staticbrowserbox.cpp into browserbox.inc
-rw-r--r--src/CMakeLists.txt1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/widgets/browserbox.cpp5
-rw-r--r--src/gui/widgets/browserbox.inc30
-rw-r--r--src/gui/widgets/staticbrowserbox.cpp5
5 files changed, 34 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a93145830..6cd1c3a25 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -119,6 +119,7 @@ SET(SRCS
gui/widgets/tabs/chat/channeltab.h
gui/widgets/browserbox.cpp
gui/widgets/browserbox.h
+ gui/widgets/browserbox.inc
gui/widgets/button.cpp
gui/widgets/button.h
gui/widgets/characterdisplay.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7009c0b0c..e02aa0972 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -245,6 +245,7 @@ BASE_SRC += events/actionevent.h \
gui/models/colorlistmodel.h \
gui/widgets/browserbox.cpp \
gui/widgets/browserbox.h \
+ gui/widgets/browserbox.inc \
gui/widgets/staticbrowserbox.cpp \
gui/widgets/staticbrowserbox.h \
gui/widgets/button.cpp \
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index fc8406546..08db7e3bf 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -31,6 +31,7 @@
#include "gui/fonts/font.h"
+#include "gui/widgets/browserbox.inc"
#include "gui/widgets/linkhandler.h"
#include "render/graphics.h"
@@ -55,10 +56,6 @@
ImageSet *BrowserBox::mEmotes = nullptr;
int BrowserBox::mInstances = 0;
-#define readColor(color) \
- mColors[0][ColorName::color] = getThemeColor(ThemeColorId::color); \
- mColors[1][ColorName::color] = getThemeColor(ThemeColorId::color##_OUTLINE)
-
BrowserBox::BrowserBox(const Widget2 *const widget,
const Opaque opaque,
const std::string &skin) :
diff --git a/src/gui/widgets/browserbox.inc b/src/gui/widgets/browserbox.inc
new file mode 100644
index 000000000..25c8744c0
--- /dev/null
+++ b/src/gui/widgets/browserbox.inc
@@ -0,0 +1,30 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2017 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_WIDGETS_BROWSERBOX_INC
+#define GUI_WIDGETS_BROWSERBOX_INC
+
+#define readColor(color) \
+ mColors[0][ColorName::color] = getThemeColor(ThemeColorId::color); \
+ mColors[1][ColorName::color] = getThemeColor(ThemeColorId::color##_OUTLINE)
+
+#endif // GUI_WIDGETS_BROWSERBOX_INC
diff --git a/src/gui/widgets/staticbrowserbox.cpp b/src/gui/widgets/staticbrowserbox.cpp
index 6cfbff014..3efcda283 100644
--- a/src/gui/widgets/staticbrowserbox.cpp
+++ b/src/gui/widgets/staticbrowserbox.cpp
@@ -31,6 +31,7 @@
#include "gui/fonts/font.h"
+#include "gui/widgets/browserbox.inc"
#include "gui/widgets/linkhandler.h"
#include "render/graphics.h"
@@ -54,10 +55,6 @@
ImageSet *StaticBrowserBox::mEmotes = nullptr;
int StaticBrowserBox::mInstances = 0;
-#define readColor(color) \
- mColors[0][ColorName::color] = getThemeColor(ThemeColorId::color); \
- mColors[1][ColorName::color] = getThemeColor(ThemeColorId::color##_OUTLINE)
-
StaticBrowserBox::StaticBrowserBox(const Widget2 *const widget,
const Opaque opaque,
const std::string &skin) :