[Bf-blender-cvs] [8965d2d] depsgraph_cleanup: Depsgraph: Use shorter prefix for util headers
Sergey Sharybin
noreply at git.blender.org
Thu May 26 13:55:06 CEST 2016
Commit: 8965d2d5d2cd1816f71043bc34563ee1f7776b60
Author: Sergey Sharybin
Date: Thu May 26 12:57:54 2016 +0200
Branches: depsgraph_cleanup
https://developer.blender.org/rB8965d2d5d2cd1816f71043bc34563ee1f7776b60
Depsgraph: Use shorter prefix for util headers
===================================================================
M source/blender/depsgraph/CMakeLists.txt
M source/blender/depsgraph/intern/builder/deg_builder.cc
M source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
M source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph.h
M source/blender/depsgraph/intern/depsgraph_build.cc
M source/blender/depsgraph/intern/depsgraph_debug.cc
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/depsgraph/intern/depsgraph_types.h
M source/blender/depsgraph/intern/eval/deg_eval.cc
M source/blender/depsgraph/intern/eval/deg_eval_flush.cc
M source/blender/depsgraph/intern/nodes/deg_node.cc
M source/blender/depsgraph/intern/nodes/deg_node.h
M source/blender/depsgraph/intern/nodes/deg_node_component.h
A source/blender/depsgraph/util/deg_util_foreach.h
A source/blender/depsgraph/util/deg_util_function.h
A source/blender/depsgraph/util/deg_util_hash.h
A source/blender/depsgraph/util/deg_util_map.h
A source/blender/depsgraph/util/deg_util_set.h
D source/blender/depsgraph/util/depsgraph_util_foreach.h
D source/blender/depsgraph/util/depsgraph_util_function.h
D source/blender/depsgraph/util/depsgraph_util_hash.h
D source/blender/depsgraph/util/depsgraph_util_map.h
D source/blender/depsgraph/util/depsgraph_util_set.h
===================================================================
diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index d2ec14f..8c25b45 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -82,10 +82,10 @@ set(SRC
intern/depsgraph_intern.h
intern/depsgraph_types.h
- util/depsgraph_util_function.h
- util/depsgraph_util_hash.h
- util/depsgraph_util_map.h
- util/depsgraph_util_set.h
+ util/deg_util_function.h
+ util/deg_util_hash.h
+ util/deg_util_map.h
+ util/deg_util_set.h
)
if(WITH_CXX11)
diff --git a/source/blender/depsgraph/intern/builder/deg_builder.cc b/source/blender/depsgraph/intern/builder/deg_builder.cc
index 1b38a5f..f9b8768 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder.cc
@@ -41,7 +41,7 @@
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
index ca5fa17..225cc64 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_cycle.cc
@@ -38,7 +38,7 @@ extern "C" {
#include "BLI_utildefines.h"
}
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
#include "intern/nodes/deg_node.h"
#include "intern/nodes/deg_node_component.h"
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index a86ba31..10aebb7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -105,7 +105,7 @@ extern "C" {
#include "intern/depsgraph_intern.h"
#include "intern/depsgraph_types.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
index 753d1f1..0322ef7 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_transitive.cc
@@ -40,7 +40,7 @@ extern "C" {
#include "intern/depsgraph.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
index bb9493b..dc2328c 100644
--- a/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
+++ b/source/blender/depsgraph/intern/debug/deg_debug_graphviz.cc
@@ -38,7 +38,7 @@ extern "C" {
} /* extern "C" */
#include "intern/depsgraph_intern.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
/* ****************** */
/* Graphviz Debugging */
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 7be2d4e..191f68f 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -58,7 +58,7 @@ extern "C" {
#include "intern/nodes/deg_node_operation.h"
#include "intern/depsgraph_intern.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/depsgraph.h b/source/blender/depsgraph/intern/depsgraph.h
index dfcd175..a02ed0c 100644
--- a/source/blender/depsgraph/intern/depsgraph.h
+++ b/source/blender/depsgraph/intern/depsgraph.h
@@ -40,8 +40,8 @@
#include "intern/depsgraph_types.h"
-#include "util/depsgraph_util_map.h"
-#include "util/depsgraph_util_set.h"
+#include "util/deg_util_map.h"
+#include "util/deg_util_set.h"
struct ID;
struct PointerRNA;
diff --git a/source/blender/depsgraph/intern/depsgraph_build.cc b/source/blender/depsgraph/intern/depsgraph_build.cc
index e19b203..4956806 100644
--- a/source/blender/depsgraph/intern/depsgraph_build.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build.cc
@@ -57,7 +57,7 @@ extern "C" {
#include "intern/depsgraph_types.h"
#include "intern/depsgraph_intern.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
/* ****************** */
/* External Build API */
diff --git a/source/blender/depsgraph/intern/depsgraph_debug.cc b/source/blender/depsgraph/intern/depsgraph_debug.cc
index 9961ea4..8e86211 100644
--- a/source/blender/depsgraph/intern/depsgraph_debug.cc
+++ b/source/blender/depsgraph/intern/depsgraph_debug.cc
@@ -40,7 +40,7 @@ extern "C" {
#include "intern/eval/deg_eval_debug.h"
#include "intern/depsgraph_intern.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
/* ************************************************ */
diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc
index 9259bdc..a5bbfe1 100644
--- a/source/blender/depsgraph/intern/depsgraph_tag.cc
+++ b/source/blender/depsgraph/intern/depsgraph_tag.cc
@@ -62,7 +62,7 @@ extern "C" {
#include "intern/nodes/deg_node_operation.h"
#include "intern/depsgraph_intern.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
/* *********************** */
/* Update Tagging/Flushing */
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index 038bcc3..7516ccb 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -36,7 +36,7 @@
#pragma once
-#include "util/depsgraph_util_function.h"
+#include "util/deg_util_function.h"
/* TODO(sergey): Ideally we'll just use char* and statically allocated strings
* to avoid any possible overhead caused by string (re)allocation/formatting.
diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc
index 6f22115..ecec871 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval.cc
@@ -51,7 +51,7 @@ extern "C" {
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
#include "intern/depsgraph.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
/* Unfinished and unused, and takes quite some pre-processing time. */
#undef USE_EVAL_PRIORITY
diff --git a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
index 25ff65b..8261966 100644
--- a/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
+++ b/source/blender/depsgraph/intern/eval/deg_eval_flush.cc
@@ -48,7 +48,7 @@ extern "C" {
#include "intern/nodes/deg_node_operation.h"
#include "intern/depsgraph_intern.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 3976cb7..a5e9b2d 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -47,7 +47,7 @@ extern "C" {
#include "intern/nodes/deg_node_component.h"
#include "intern/nodes/deg_node_operation.h"
#include "intern/depsgraph_intern.h"
-#include "util/depsgraph_util_foreach.h"
+#include "util/deg_util_foreach.h"
namespace DEG {
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h
index b521e76..4381935 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -32,9 +32,9 @@
#include "intern/depsgraph_types.h"
-#include "util/depsgraph_util_hash.h"
-#include "util/depsgraph_util_map.h"
-#include "util/depsgraph_util_set.h"
+#include "util/deg_util_hash.h"
+#include "util/deg_util_map.h"
+#include "util/deg_util_set.h"
struct ID;
struct Scene;
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index 692a54a..92849fb 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -32,9 +32,9 @@
#include "intern/nodes/deg_node.h"
-#include "util/depsgraph_util_hash.h"
-#include "util/depsgraph_util_map.h"
-#include "util/depsgraph_util_set.h"
+#include "util/deg_util_hash.h"
+#include "util/deg_util_map.h"
+#include "util/deg_util_set.h"
#include "BLI_utildefines.h"
#include "BLI_string.h"
diff --git a/source/blender/depsgraph/util/depsgraph_util_foreach.h b/source/blender/depsgraph/util/deg_util_foreach.h
similarity index 96%
rename from source/blender/depsgraph/util/depsgraph_util_foreach.h
rename to source/blender/depsgraph/util/deg_util_foreach.h
index b2f1ebf..378ce77 100644
--- a/source/blender/depsgraph/util/depsgraph_util_foreach.h
+++ b/source/blender/depsgraph/util/deg_util_foreach.h
@@ -24,7 +24,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/depsgraph/util/depsgraph_util_foreach.h
+/** \file blender/depsgraph/util/deg_util_foreach.h
* \ingroup depsgraph
*/
diff --git a/source/blender/depsgraph/util/depsgraph_util_function.h b/source/blender/depsgraph/util/deg_util_function.h
similarity index 97%
rename from source/blender/depsgraph/util/depsgraph_util_function.h
rename to source/blender/depsgraph/util/deg_util_function.h
index a430183..f10dbf5 100644
--- a/source/blender/depsgraph/util/depsgraph_util_function.h
+++ b/source/blender/depsgraph/util/deg_util_function.h
@@ -24,7 +24,7 @@
* ***** END GPL LICENSE BLOCK *****
*/
-/** \file blender/depsgraph/util/depsgraph_util_function.h
+/** \file blender/depsgraph/util/deg_util_function.h
* \ingroup depsgraph
*/
diff --git a/source/blender/depsgraph/util/depsgraph_util_hash.h b/source/blender/depsgraph/util/deg_util_hash.h
similarity index 97%
rename from source/blender/depsg
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list