[Bf-blender-cvs] [37bc9ffc535] functions: remove using namespace BLI
Jacques Lucke
noreply at git.blender.org
Fri Sep 27 15:27:45 CEST 2019
Commit: 37bc9ffc5350353d95539ce7ceeab5e13ac5f252
Author: Jacques Lucke
Date: Fri Sep 27 15:27:33 2019 +0200
Branches: functions
https://developer.blender.org/rB37bc9ffc5350353d95539ce7ceeab5e13ac5f252
remove using namespace BLI
===================================================================
M source/blender/functions/backends/cpp/list.hpp
M source/blender/functions/core/data_graph.hpp
M source/blender/functions/core/function.hpp
M source/blender/functions/core/function_builder.hpp
M source/blender/functions/core/function_graph.hpp
M source/blender/functions/core/type.hpp
M source/blender/functions/frontends/data_flow_nodes/data_flow_nodes-c.cpp
M source/blender/functions/frontends/data_flow_nodes/mappings.hpp
M source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.cpp
M source/blender/functions/functions/object_input.cpp
===================================================================
diff --git a/source/blender/functions/backends/cpp/list.hpp b/source/blender/functions/backends/cpp/list.hpp
index 7a39a1b84a4..c21ffe1d358 100644
--- a/source/blender/functions/backends/cpp/list.hpp
+++ b/source/blender/functions/backends/cpp/list.hpp
@@ -6,6 +6,9 @@
namespace FN {
+using BLI::AutoRefCount;
+using BLI::RefCounter;
+
class List;
using SharedList = AutoRefCount<List>;
diff --git a/source/blender/functions/core/data_graph.hpp b/source/blender/functions/core/data_graph.hpp
index 8dbaec61fca..93d9f3e7cfa 100644
--- a/source/blender/functions/core/data_graph.hpp
+++ b/source/blender/functions/core/data_graph.hpp
@@ -32,6 +32,7 @@
namespace FN {
+using BLI::IndexRange;
using BLI::Map;
using BLI::MonotonicAllocator;
diff --git a/source/blender/functions/core/function.hpp b/source/blender/functions/core/function.hpp
index ee045a4f1df..d588e6c9b06 100644
--- a/source/blender/functions/core/function.hpp
+++ b/source/blender/functions/core/function.hpp
@@ -21,7 +21,6 @@
#include <functional>
-#include "BLI_chained_strings.h"
#include "BLI_utility_mixins.h"
#include "BLI_owned_resources.h"
@@ -29,6 +28,9 @@
namespace FN {
+using BLI::OwnedResources;
+using BLI::Vector;
+
class Function;
class FunctionBody : BLI::NonCopyable, BLI::NonMovable {
diff --git a/source/blender/functions/core/function_builder.hpp b/source/blender/functions/core/function_builder.hpp
index 9965039f5d8..4a26a537f8f 100644
--- a/source/blender/functions/core/function_builder.hpp
+++ b/source/blender/functions/core/function_builder.hpp
@@ -1,10 +1,15 @@
#pragma once
+#include "BLI_chained_strings.h"
+
#include "function.hpp"
#include "data_graph.hpp"
namespace FN {
+using BLI::ChainedStringRef;
+using BLI::ChainedStringsBuilder;
+
class FunctionBuilder {
private:
ChainedStringsBuilder m_strings_builder;
diff --git a/source/blender/functions/core/function_graph.hpp b/source/blender/functions/core/function_graph.hpp
index f390a8bdae5..9c17c9b87e3 100644
--- a/source/blender/functions/core/function_graph.hpp
+++ b/source/blender/functions/core/function_graph.hpp
@@ -13,6 +13,7 @@
namespace FN {
+using BLI::Set;
using BLI::VectorSet;
class FunctionGraph {
diff --git a/source/blender/functions/core/type.hpp b/source/blender/functions/core/type.hpp
index 5e0127a3159..cc11b40c6fd 100644
--- a/source/blender/functions/core/type.hpp
+++ b/source/blender/functions/core/type.hpp
@@ -28,7 +28,11 @@
namespace FN {
-using namespace BLI;
+using BLI::ArrayRef;
+using BLI::make_unique;
+using BLI::MutableArrayRef;
+using BLI::StringRef;
+using BLI::StringRefNull;
class Type;
diff --git a/source/blender/functions/frontends/data_flow_nodes/data_flow_nodes-c.cpp b/source/blender/functions/frontends/data_flow_nodes/data_flow_nodes-c.cpp
index cf548696537..5ba276117a6 100644
--- a/source/blender/functions/frontends/data_flow_nodes/data_flow_nodes-c.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/data_flow_nodes-c.cpp
@@ -2,6 +2,7 @@
#include "BLI_timeit.h"
using namespace FN;
+using BLI::Optional;
FnFunction FN_tree_to_function(bNodeTree *btree)
{
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings.hpp b/source/blender/functions/frontends/data_flow_nodes/mappings.hpp
index 6ee4eaeb261..3f225318f88 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings.hpp
@@ -11,6 +11,7 @@ namespace DataFlowNodes {
using BKE::VirtualNode;
using BKE::VirtualSocket;
+using BLI::StringMap;
using StringPair = std::pair<std::string, std::string>;
class VTreeDataGraphBuilder;
diff --git a/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.cpp b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.cpp
index ecb5c4b164f..144d472035d 100644
--- a/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_groupers.cpp
@@ -3,6 +3,8 @@
namespace FN {
namespace DataFlowNodes {
+using BLI::MultiMap;
+
void SeparateNodeInputs::group(VTreeDataGraphBuilder &builder,
MultiVector<VirtualSocket *> &r_groups)
{
diff --git a/source/blender/functions/functions/object_input.cpp b/source/blender/functions/functions/object_input.cpp
index d2f1874b260..a9e8b4d4054 100644
--- a/source/blender/functions/functions/object_input.cpp
+++ b/source/blender/functions/functions/object_input.cpp
@@ -11,6 +11,8 @@
namespace FN {
namespace Functions {
+using BLI::float3;
+using BLI::float4x4;
using namespace Types;
class ObjectLocation : public TupleCallBody {
More information about the Bf-blender-cvs
mailing list