diff options
| author | Andrei Karas <akaras@inbox.ru> | 2018-02-26 03:11:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2018-02-26 03:11:44 +0300 |
| commit | 06db32f677e630efaf716de5655e72af920dcaf6 (patch) | |
| tree | 85837a53bd85d63a5765bf619ed60f6610746e1a | |
| parent | 839c541b991703b609d6a362222787347faac789 (diff) | |
| download | manaverse-06db32f677e630efaf716de5655e72af920dcaf6.tar.gz manaverse-06db32f677e630efaf716de5655e72af920dcaf6.tar.bz2 manaverse-06db32f677e630efaf716de5655e72af920dcaf6.tar.xz manaverse-06db32f677e630efaf716de5655e72af920dcaf6.zip | |
Rename themecolortype.h into themecolortype.inc.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/gui/themecolorid.h | 2 | ||||
| -rw-r--r-- | src/gui/theme.cpp | 2 | ||||
| -rw-r--r-- | src/gui/themecolortype.inc (renamed from src/gui/themecolortype.h) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 48f698c8f..a12eaff47 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -527,7 +527,7 @@ SET(SRCS gui/theme.h gui/themecolorsidoperators.cpp gui/themecolorsidoperators.h - gui/themecolortype.h + gui/themecolortype.inc gui/themeinfo.h gui/touchactiondata.cpp gui/touchactiondata.h diff --git a/src/Makefile.am b/src/Makefile.am index 3aecc04f3..6d36f0c08 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -427,7 +427,7 @@ BASE_SRC += client.h \ gui/theme.h \ gui/themecolorsidoperators.cpp \ gui/themecolorsidoperators.h \ - gui/themecolortype.h \ + gui/themecolortype.inc \ gui/themeinfo.h \ gui/userpalette.cpp \ gui/userpalette.h \ diff --git a/src/enums/gui/themecolorid.h b/src/enums/gui/themecolorid.h index fea460949..ea6a3c30a 100644 --- a/src/enums/gui/themecolorid.h +++ b/src/enums/gui/themecolorid.h @@ -29,7 +29,7 @@ enumStart(ThemeColorId) { -#include "gui/themecolortype.h" +#include "gui/themecolortype.inc" } enumEnd(ThemeColorId); diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 4211fb2be..c345e6911 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -671,7 +671,7 @@ static int readColorType(const std::string &type) static const std::string colors[CAST_SIZE( ThemeColorId::THEME_COLORS_END)] = { -#include "gui/themecolortype.h" +#include "gui/themecolortype.inc" }; if (type.empty()) diff --git a/src/gui/themecolortype.h b/src/gui/themecolortype.inc index 666aebbc8..666aebbc8 100644 --- a/src/gui/themecolortype.h +++ b/src/gui/themecolortype.inc |