summaryrefslogtreecommitdiffstats
path: root/core/object.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-11 18:13:45 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-09-12 09:52:22 +0200
commit277b24dfb7acdb42589b931252bbe7be81c7536e (patch)
tree248dc6dfca0e27c3b03533b45753a16d186d2811 /core/object.h
parentcc71012266f880dcf3b37e40d5f90d9ce8b7a432 (diff)
downloadredot-engine-277b24dfb7acdb42589b931252bbe7be81c7536e.tar.gz
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/object.h')
-rw-r--r--core/object.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/object.h b/core/object.h
index 43e1cf4785..be405a47a6 100644
--- a/core/object.h
+++ b/core/object.h
@@ -31,13 +31,13 @@
#ifndef OBJECT_H
#define OBJECT_H
-#include "hash_map.h"
-#include "list.h"
-#include "map.h"
-#include "os/rw_lock.h"
-#include "set.h"
-#include "variant.h"
-#include "vmap.h"
+#include "core/hash_map.h"
+#include "core/list.h"
+#include "core/map.h"
+#include "core/os/rw_lock.h"
+#include "core/set.h"
+#include "core/variant.h"
+#include "core/vmap.h"
#define VARIANT_ARG_LIST const Variant &p_arg1 = Variant(), const Variant &p_arg2 = Variant(), const Variant &p_arg3 = Variant(), const Variant &p_arg4 = Variant(), const Variant &p_arg5 = Variant()
#define VARIANT_ARG_PASS p_arg1, p_arg2, p_arg3, p_arg4, p_arg5
@@ -779,6 +779,6 @@ public:
};
//needed by macros
-#include "class_db.h"
+#include "core/class_db.h"
#endif