summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/gui/colorpair.h40
-rw-r--r--src/gui/models/colormodel.h14
4 files changed, 45 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f4557db2..04c2217df 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -956,7 +956,9 @@ SET(SRCS
gui/chatlog.h
gui/chatmsgtype.h
gui/cliprect.h
+ gui/color.cpp
gui/color.h
+ gui/colorpair.h
gui/dialogtype.h
listeners/deathlistener.h
listeners/errorlistener.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index ac41e0f5d..92e140d6c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -220,6 +220,7 @@ manaplus_SOURCES += events/actionevent.h \
gui/widgets/basiccontainer.cpp \
gui/cliprect.cpp \
gui/color.cpp \
+ gui/colorpair.h \
gui/dialogsmanager.cpp \
gui/dialogsmanager.h \
input/key.cpp \
diff --git a/src/gui/colorpair.h b/src/gui/colorpair.h
new file mode 100644
index 000000000..c0c699777
--- /dev/null
+++ b/src/gui/colorpair.h
@@ -0,0 +1,40 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2012-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 GUI_COLORPAIR_H
+#define GUI_COLORPAIR_H
+
+#include "localconsts.h"
+
+class Color;
+
+struct ColorPair
+{
+ ColorPair(const Color* c1, const Color* c2) :
+ color1(c1),
+ color2(c2)
+ {
+ }
+
+ const Color* color1;
+ const Color* color2;
+};
+
+#endif // GUI_COLORPAIR_H
diff --git a/src/gui/models/colormodel.h b/src/gui/models/colormodel.h
index f3d6f3617..068da0dd9 100644
--- a/src/gui/models/colormodel.h
+++ b/src/gui/models/colormodel.h
@@ -23,6 +23,8 @@
#include "utils/stringvector.h"
+#include "gui/colorpair.h"
+
#include "gui/models/listmodel.h"
#include "localconsts.h"
@@ -30,18 +32,6 @@
class Color;
class Widget2;
-struct ColorPair
-{
- ColorPair(const Color* c1, const Color* c2) :
- color1(c1),
- color2(c2)
- {
- }
-
- const Color* color1;
- const Color* color2;
-};
-
class ColorModel : public ListModel
{
public: