summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-13 23:20:02 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-13 23:20:02 +0300
commita55e7e257730e6cee115f407e31f8a91dc9ad447 (patch)
tree8d833ab258060c4fa28d0ec97fb18791a3011693 /src/gui
parent6e5976f5fb99c99b4142ee2a8f8f81598559954d (diff)
downloadmanaverse-a55e7e257730e6cee115f407e31f8a91dc9ad447.tar.gz
manaverse-a55e7e257730e6cee115f407e31f8a91dc9ad447.tar.bz2
manaverse-a55e7e257730e6cee115f407e31f8a91dc9ad447.tar.xz
manaverse-a55e7e257730e6cee115f407e31f8a91dc9ad447.zip
Move theme related constants into separate file.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/theme.cpp2
-rw-r--r--src/gui/theme.h2
-rw-r--r--src/gui/widgets/widget2.h3
3 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 067ececda..c98e463dc 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -27,6 +27,8 @@
#include "configuration.h"
#include "graphicsmanager.h"
+#include "const/gui/theme.h"
+
#include "gui/skin.h"
#include "gui/themeinfo.h"
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 2332db1da..2afb41da7 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -46,8 +46,6 @@ class Theme;
struct ThemeInfo;
-const int THEME_PALETTES = 5;
-
extern Theme *theme;
class Theme final : public Palette,
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index 5955397fc..b8c0163d2 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -21,8 +21,9 @@
#ifndef GUI_WIDGETS_WIDGET2_H
#define GUI_WIDGETS_WIDGET2_H
-#include "gui/themecolorsidoperators.h"
+#include "const/gui/theme.h"
+#include "gui/themecolorsidoperators.h"
#include "gui/theme.h"
class Widget;