From 20a85d76d94c9c5c7fbe198c3d0e1fbee97a485f Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Thu, 9 Nov 2017 01:56:20 +0300 Subject: Move files to subdirectories (#6599) * Move files around --- src/util/container.h | 8 ++++---- src/util/directiontables.h | 4 ++-- src/util/numeric.cpp | 6 +++--- src/util/numeric.h | 8 ++++---- src/util/pointedthing.cpp | 2 +- src/util/pointedthing.h | 4 ++-- src/util/pointer.h | 4 ++-- src/util/serialize.cpp | 4 ++-- src/util/serialize.h | 6 +++--- src/util/string.cpp | 4 ++-- src/util/thread.h | 6 +++--- src/util/timetaker.cpp | 4 ++-- src/util/timetaker.h | 4 ++-- 13 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src/util') diff --git a/src/util/container.h b/src/util/container.h index 81f085017..2ad2bbfc7 100644 --- a/src/util/container.h +++ b/src/util/container.h @@ -19,10 +19,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "../irrlichttypes.h" -#include "../exceptions.h" -#include "../threading/mutex_auto_lock.h" -#include "../threading/semaphore.h" +#include "irrlichttypes.h" +#include "exceptions.h" +#include "threading/mutex_auto_lock.h" +#include "threading/semaphore.h" #include #include #include diff --git a/src/util/directiontables.h b/src/util/directiontables.h index 97e18343a..ef00e3bfe 100644 --- a/src/util/directiontables.h +++ b/src/util/directiontables.h @@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "../irrlichttypes.h" -#include "../irr_v3d.h" +#include "irrlichttypes.h" +#include "irr_v3d.h" extern const v3s16 g_6dirs[6]; diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp index a48a72a8a..ebc81185f 100644 --- a/src/util/numeric.cpp +++ b/src/util/numeric.cpp @@ -20,9 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "numeric.h" #include "log.h" -#include "../constants.h" // BS, MAP_BLOCKSIZE -#include "../noise.h" // PseudoRandom, PcgRandom -#include "../threading/mutex_auto_lock.h" +#include "constants.h" // BS, MAP_BLOCKSIZE +#include "noise.h" // PseudoRandom, PcgRandom +#include "threading/mutex_auto_lock.h" #include diff --git a/src/util/numeric.h b/src/util/numeric.h index f09c4e9f5..347e7a49e 100644 --- a/src/util/numeric.h +++ b/src/util/numeric.h @@ -20,10 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once #include "basic_macros.h" -#include "../irrlichttypes.h" -#include "../irr_v2d.h" -#include "../irr_v3d.h" -#include "../irr_aabb3d.h" +#include "irrlichttypes.h" +#include "irr_v2d.h" +#include "irr_v3d.h" +#include "irr_aabb3d.h" #define rangelim(d, min, max) ((d) < (min) ? (min) : ((d) > (max) ? (max) : (d))) #define myfloor(x) ((x) < 0.0 ? (int)(x) - 1 : (int)(x)) diff --git a/src/util/pointedthing.cpp b/src/util/pointedthing.cpp index e5c5dcf4c..c5961d56e 100644 --- a/src/util/pointedthing.cpp +++ b/src/util/pointedthing.cpp @@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "pointedthing.h" #include "serialize.h" -#include "../exceptions.h" +#include "exceptions.h" #include PointedThing::PointedThing(const v3s16 &under, const v3s16 &above, diff --git a/src/util/pointedthing.h b/src/util/pointedthing.h index bd95ef1f3..4c4c04234 100644 --- a/src/util/pointedthing.h +++ b/src/util/pointedthing.h @@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "../irrlichttypes.h" -#include "../irr_v3d.h" +#include "irrlichttypes.h" +#include "irr_v3d.h" #include #include diff --git a/src/util/pointer.h b/src/util/pointer.h index 59b6f5216..d29ec8739 100644 --- a/src/util/pointer.h +++ b/src/util/pointer.h @@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "../irrlichttypes.h" -#include "../debug.h" // For assert() +#include "irrlichttypes.h" +#include "debug.h" // For assert() #include template diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp index a272d82ee..53c7c2add 100644 --- a/src/util/serialize.cpp +++ b/src/util/serialize.cpp @@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "pointer.h" #include "porting.h" #include "util/string.h" -#include "../exceptions.h" -#include "../irrlichttypes.h" +#include "exceptions.h" +#include "irrlichttypes.h" #include #include diff --git a/src/util/serialize.h b/src/util/serialize.h index f2b0dab2f..89bc0b097 100644 --- a/src/util/serialize.h +++ b/src/util/serialize.h @@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "../irrlichttypes_bloated.h" -#include "../exceptions.h" // for SerializationError -#include "../debug.h" // for assert +#include "irrlichttypes_bloated.h" +#include "exceptions.h" // for SerializationError +#include "debug.h" // for assert #include "config.h" #if HAVE_ENDIAN_H diff --git a/src/util/string.cpp b/src/util/string.cpp index bb2d2f6a7..3eabcbe11 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "hex.h" -#include "../porting.h" -#include "../translation.h" +#include "porting.h" +#include "translation.h" #include #include diff --git a/src/util/thread.h b/src/util/thread.h index 5338dad03..73e9beb80 100644 --- a/src/util/thread.h +++ b/src/util/thread.h @@ -19,9 +19,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "../irrlichttypes.h" -#include "../threading/thread.h" -#include "../threading/mutex_auto_lock.h" +#include "irrlichttypes.h" +#include "threading/thread.h" +#include "threading/mutex_auto_lock.h" #include "porting.h" #include "log.h" #include "container.h" diff --git a/src/util/timetaker.cpp b/src/util/timetaker.cpp index 6079e5cca..717449c6d 100644 --- a/src/util/timetaker.cpp +++ b/src/util/timetaker.cpp @@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "timetaker.h" -#include "../porting.h" -#include "../log.h" +#include "porting.h" +#include "log.h" #include TimeTaker::TimeTaker(const std::string &name, u64 *result, TimePrecision prec) diff --git a/src/util/timetaker.h b/src/util/timetaker.h index 2988e8133..bc3d4a88d 100644 --- a/src/util/timetaker.h +++ b/src/util/timetaker.h @@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #pragma once -#include "../irrlichttypes.h" -#include "../gettime.h" +#include "irrlichttypes.h" +#include "gettime.h" /* TimeTaker -- cgit v1.2.3