diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-11 18:13:45 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-12 09:52:22 +0200 |
| commit | 277b24dfb7acdb42589b931252bbe7be81c7536e (patch) | |
| tree | 248dc6dfca0e27c3b03533b45753a16d186d2811 /core/ustring.cpp | |
| parent | cc71012266f880dcf3b37e40d5f90d9ce8b7a432 (diff) | |
Make core/ includes absolute, remove subfolders from include path
This allows more consistency in the manner we include core headers,
where previously there would be a mix of absolute, relative and
include path-dependent includes.
Diffstat (limited to 'core/ustring.cpp')
| -rw-r--r-- | core/ustring.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index 96e3a3d784..e46896ca85 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -30,12 +30,13 @@ #include "ustring.h" -#include "color.h" -#include "math_funcs.h" -#include "os/memory.h" -#include "print_string.h" -#include "ucaps.h" -#include "variant.h" +#include "core/color.h" +#include "core/math/math_funcs.h" +#include "core/os/memory.h" +#include "core/print_string.h" +#include "core/translation.h" +#include "core/ucaps.h" +#include "core/variant.h" #include "thirdparty/misc/md5.h" #include "thirdparty/misc/sha256.h" @@ -4204,8 +4205,6 @@ String String::unquote() const { return substr(1, length() - 2); } -#include "translation.h" - #ifdef TOOLS_ENABLED String TTR(const String &p_text) { |