[Bf-blender-cvs] [3157c3680bb] master: Cleanup: remove unnecessary namespace specifiers
Jacques Lucke
noreply at git.blender.org
Wed Mar 17 11:53:13 CET 2021
Commit: 3157c3680bb74444db7b5d90b09ca05dedaf9073
Author: Jacques Lucke
Date: Wed Mar 17 11:51:51 2021 +0100
Branches: master
https://developer.blender.org/rB3157c3680bb74444db7b5d90b09ca05dedaf9073
Cleanup: remove unnecessary namespace specifiers
===================================================================
M source/blender/blenkernel/intern/attribute_access_intern.hh
===================================================================
diff --git a/source/blender/blenkernel/intern/attribute_access_intern.hh b/source/blender/blenkernel/intern/attribute_access_intern.hh
index a6fd49bb0c6..806d10e9e89 100644
--- a/source/blender/blenkernel/intern/attribute_access_intern.hh
+++ b/source/blender/blenkernel/intern/attribute_access_intern.hh
@@ -108,7 +108,7 @@ template<typename T> class OwnedArrayReadAttribute final : public ReadAttribute
template<typename StructT, typename ElemT, ElemT (*GetFunc)(const StructT &)>
class DerivedArrayReadAttribute final : public ReadAttribute {
private:
- blender::Span<StructT> data_;
+ Span<StructT> data_;
public:
DerivedArrayReadAttribute(AttributeDomain domain, Span<StructT> data)
@@ -162,10 +162,10 @@ template<typename StructT,
void (*SetFunc)(StructT &, const ElemT &)>
class DerivedArrayWriteAttribute final : public WriteAttribute {
private:
- blender::MutableSpan<StructT> data_;
+ MutableSpan<StructT> data_;
public:
- DerivedArrayWriteAttribute(AttributeDomain domain, blender::MutableSpan<StructT> data)
+ DerivedArrayWriteAttribute(AttributeDomain domain, MutableSpan<StructT> data)
: WriteAttribute(domain, CPPType::get<ElemT>(), data.size()), data_(data)
{
}
@@ -250,7 +250,7 @@ class BuiltinAttributeProvider {
virtual bool try_create(GeometryComponent &UNUSED(component)) const = 0;
virtual bool exists(const GeometryComponent &component) const = 0;
- blender::StringRefNull name() const
+ StringRefNull name() const
{
return name_;
}
@@ -273,13 +273,12 @@ class BuiltinAttributeProvider {
class DynamicAttributesProvider {
public:
virtual ReadAttributePtr try_get_for_read(const GeometryComponent &component,
- const blender::StringRef attribute_name) const = 0;
+ const StringRef attribute_name) const = 0;
virtual WriteAttributePtr try_get_for_write(GeometryComponent &component,
- const blender::StringRef attribute_name) const = 0;
- virtual bool try_delete(GeometryComponent &component,
- const blender::StringRef attribute_name) const = 0;
+ const StringRef attribute_name) const = 0;
+ virtual bool try_delete(GeometryComponent &component, const StringRef attribute_name) const = 0;
virtual bool try_create(GeometryComponent &UNUSED(component),
- const blender::StringRef UNUSED(attribute_name),
+ const StringRef UNUSED(attribute_name),
const AttributeDomain UNUSED(domain),
const CustomDataType UNUSED(data_type)) const
{
@@ -311,16 +310,15 @@ class CustomDataAttributeProvider final : public DynamicAttributesProvider {
}
ReadAttributePtr try_get_for_read(const GeometryComponent &component,
- const blender::StringRef attribute_name) const final;
+ const StringRef attribute_name) const final;
WriteAttributePtr try_get_for_write(GeometryComponent &component,
- const blender::StringRef attribute_name) const final;
+ const StringRef attribute_name) const final;
- bool try_delete(GeometryComponent &component,
- const blender::StringRef attribute_name) const final;
+ bool try_delete(GeometryComponent &component, const StringRef attribute_name) const final;
bool try_create(GeometryComponent &component,
- const blender::StringRef attribute_name,
+ const StringRef attribute_name,
const AttributeDomain domain,
const CustomDataType data_type) const final;
@@ -451,21 +449,20 @@ class ComponentAttributeProviders {
* higher priority when an attribute name is looked up. Usually, that means that builtin
* providers are checked before dynamic ones.
*/
- blender::Map<std::string, const BuiltinAttributeProvider *> builtin_attribute_providers_;
+ Map<std::string, const BuiltinAttributeProvider *> builtin_attribute_providers_;
/**
* An ordered list of dynamic attribute providers. The order is important because that is order
* in which they are checked when an attribute is looked up.
*/
- blender::Vector<const DynamicAttributesProvider *> dynamic_attribute_providers_;
+ Vector<const DynamicAttributesProvider *> dynamic_attribute_providers_;
/**
* All the domains that are supported by at least one of the providers above.
*/
- blender::VectorSet<AttributeDomain> supported_domains_;
+ VectorSet<AttributeDomain> supported_domains_;
public:
- ComponentAttributeProviders(
- blender::Span<const BuiltinAttributeProvider *> builtin_attribute_providers,
- blender::Span<const DynamicAttributesProvider *> dynamic_attribute_providers)
+ ComponentAttributeProviders(Span<const BuiltinAttributeProvider *> builtin_attribute_providers,
+ Span<const DynamicAttributesProvider *> dynamic_attribute_providers)
: dynamic_attribute_providers_(dynamic_attribute_providers)
{
for (const BuiltinAttributeProvider *provider : builtin_attribute_providers) {
@@ -478,18 +475,17 @@ class ComponentAttributeProviders {
}
}
- const blender::Map<std::string, const BuiltinAttributeProvider *> &builtin_attribute_providers()
- const
+ const Map<std::string, const BuiltinAttributeProvider *> &builtin_attribute_providers() const
{
return builtin_attribute_providers_;
}
- blender::Span<const DynamicAttributesProvider *> dynamic_attribute_providers() const
+ Span<const DynamicAttributesProvider *> dynamic_attribute_providers() const
{
return dynamic_attribute_providers_;
}
- blender::Span<AttributeDomain> supported_domains() const
+ Span<AttributeDomain> supported_domains() const
{
return supported_domains_;
}
More information about the Bf-blender-cvs
mailing list