From 9941d83e1d5880a355452f630a1da4c291bc568b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 22 Aug 2022 18:35:43 +0200
Subject: [PATCH] Trade: rename internal MaterialData helpers for consistency.

This is how SceneData names it, a prep for introducing findAttributeId()
and findLayerId().
---
 src/Magnum/Trade/MaterialData.cpp | 64 +++++++++++++++----------------
 src/Magnum/Trade/MaterialData.h   | 28 +++++++-------
 2 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/Magnum/Trade/MaterialData.cpp b/src/Magnum/Trade/MaterialData.cpp
index b8b12099f..debe4ecce 100644
--- a/src/Magnum/Trade/MaterialData.cpp
+++ b/src/Magnum/Trade/MaterialData.cpp
@@ -314,7 +314,7 @@ Containers::StringView MaterialData::attributeString(const MaterialAttribute nam
     return AttributeMap[UnsignedInt(name) - 1].name;
 }
 
-UnsignedInt MaterialData::layerFor(const Containers::StringView layer) const {
+UnsignedInt MaterialData::findLayerIdInternal(const Containers::StringView layer) const {
     for(std::size_t i = 1; i < _layerOffsets.size(); ++i) {
         if(_layerOffsets[i] > _layerOffsets[i - 1] &&
            _data[_layerOffsets[i - 1]].name() == " LayerName"_s &&
@@ -325,7 +325,7 @@ UnsignedInt MaterialData::layerFor(const Containers::StringView layer) const {
 }
 
 bool MaterialData::hasLayer(const Containers::StringView layer) const {
-    return layerFor(layer) != ~UnsignedInt{};
+    return findLayerIdInternal(layer) != ~UnsignedInt{};
 }
 
 bool MaterialData::hasLayer(const MaterialLayer layer) const {
@@ -335,7 +335,7 @@ bool MaterialData::hasLayer(const MaterialLayer layer) const {
 }
 
 UnsignedInt MaterialData::layerId(const Containers::StringView layer) const {
-    const UnsignedInt id = layerFor(layer);
+    const UnsignedInt id = findLayerIdInternal(layer);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::layerId(): layer" << layer << "not found", {});
     return id;
@@ -363,7 +363,7 @@ Float MaterialData::layerFactor(const UnsignedInt layer) const {
 }
 
 Float MaterialData::layerFactor(const Containers::StringView layer) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::layerFactor(): layer" << layer << "not found", {});
     return layerFactor(layerId);
@@ -383,7 +383,7 @@ UnsignedInt MaterialData::layerFactorTexture(const UnsignedInt layer) const {
 
 UnsignedInt MaterialData::layerFactorTexture(const Containers::StringView layer) const {
     #ifndef CORRADE_NO_ASSERT
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     #endif
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::layerFactorTexture(): layer" << layer << "not found", {});
@@ -408,7 +408,7 @@ MaterialTextureSwizzle MaterialData::layerFactorTextureSwizzle(const UnsignedInt
 
 MaterialTextureSwizzle MaterialData::layerFactorTextureSwizzle(const Containers::StringView layer) const {
     #ifndef CORRADE_NO_ASSERT
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     #endif
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::layerFactorTextureSwizzle(): layer" << layer << "not found", {});
@@ -438,7 +438,7 @@ Matrix3 MaterialData::layerFactorTextureMatrix(const UnsignedInt layer) const {
 }
 
 Matrix3 MaterialData::layerFactorTextureMatrix(const Containers::StringView layer) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::layerFactorTextureMatrix(): layer" << layer << "not found", {});
     CORRADE_ASSERT(hasAttribute(layerId, MaterialAttribute::LayerFactorTexture),
@@ -471,7 +471,7 @@ UnsignedInt MaterialData::layerFactorTextureCoordinates(const UnsignedInt layer)
 }
 
 UnsignedInt MaterialData::layerFactorTextureCoordinates(const Containers::StringView layer) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::layerFactorTextureCoordinates(): layer" << layer << "not found", {});
     CORRADE_ASSERT(hasAttribute(layerId, MaterialAttribute::LayerFactorTexture),
@@ -504,7 +504,7 @@ UnsignedInt MaterialData::layerFactorTextureLayer(const UnsignedInt layer) const
 }
 
 UnsignedInt MaterialData::layerFactorTextureLayer(const Containers::StringView layer) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::layerFactorTextureLayer(): layer" << layer << "not found", {});
     CORRADE_ASSERT(hasAttribute(layerId, MaterialAttribute::LayerFactorTexture),
@@ -533,7 +533,7 @@ UnsignedInt MaterialData::attributeCount(const UnsignedInt layer) const {
 }
 
 UnsignedInt MaterialData::attributeCount(const Containers::StringView layer) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attributeCount(): layer" << layer << "not found", {});
     return attributeCount(layerId);
@@ -545,7 +545,7 @@ UnsignedInt MaterialData::attributeCount(const MaterialLayer layer) const {
     return attributeCount(string);
 }
 
-UnsignedInt MaterialData::attributeFor(const UnsignedInt layer, const Containers::StringView name) const {
+UnsignedInt MaterialData::findAttributeIdInternal(const UnsignedInt layer, const Containers::StringView name) const {
     const MaterialAttributeData* begin = _data.begin() +
         (layer && _layerOffsets ? _layerOffsets[layer - 1] : 0);
     const MaterialAttributeData* end =
@@ -560,7 +560,7 @@ UnsignedInt MaterialData::attributeFor(const UnsignedInt layer, const Containers
 bool MaterialData::hasAttribute(const UnsignedInt layer, const Containers::StringView name) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::hasAttribute(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    return attributeFor(layer, name) != ~UnsignedInt{};
+    return findAttributeIdInternal(layer, name) != ~UnsignedInt{};
 }
 
 bool MaterialData::hasAttribute(const UnsignedInt layer, const MaterialAttribute name) const {
@@ -570,7 +570,7 @@ bool MaterialData::hasAttribute(const UnsignedInt layer, const MaterialAttribute
 }
 
 bool MaterialData::hasAttribute(const Containers::StringView layer, const Containers::StringView name) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::hasAttribute(): layer" << layer << "not found", {});
     return hasAttribute(layerId, name);
@@ -597,7 +597,7 @@ bool MaterialData::hasAttribute(const MaterialLayer layer, const MaterialAttribu
 UnsignedInt MaterialData::attributeId(const UnsignedInt layer, const Containers::StringView name) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::attributeId(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attributeId(): attribute" << name << "not found in layer" << layer, {});
     return id;
@@ -610,10 +610,10 @@ UnsignedInt MaterialData::attributeId(const UnsignedInt layer, const MaterialAtt
 }
 
 UnsignedInt MaterialData::attributeId(const Containers::StringView layer, const Containers::StringView name) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attributeId(): layer" << layer << "not found", {});
-    const UnsignedInt id = attributeFor(layerId, name);
+    const UnsignedInt id = findAttributeIdInternal(layerId, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attributeId(): attribute" << name << "not found in layer" << layer, {});
     return id;
@@ -646,7 +646,7 @@ Containers::StringView MaterialData::attributeName(const UnsignedInt layer, cons
 }
 
 Containers::StringView MaterialData::attributeName(const Containers::StringView layer, const UnsignedInt id) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attributeName(): layer" << layer << "not found", {});
     CORRADE_ASSERT(id < attributeCount(layer),
@@ -671,7 +671,7 @@ MaterialAttributeType MaterialData::attributeType(const UnsignedInt layer, const
 MaterialAttributeType MaterialData::attributeType(const UnsignedInt layer, const Containers::StringView name) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::attributeType(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attributeType(): attribute" << name << "not found in layer" << layer, {});
     return _data[layerOffset(layer) + id]._data.type;
@@ -684,7 +684,7 @@ MaterialAttributeType MaterialData::attributeType(const UnsignedInt layer, const
 }
 
 MaterialAttributeType MaterialData::attributeType(const Containers::StringView layer, const UnsignedInt id) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attributeType(): layer" << layer << "not found", {});
     CORRADE_ASSERT(id < attributeCount(layer),
@@ -693,10 +693,10 @@ MaterialAttributeType MaterialData::attributeType(const Containers::StringView l
 }
 
 MaterialAttributeType MaterialData::attributeType(const Containers::StringView layer, const Containers::StringView name) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attributeType(): layer" << layer << "not found", {});
-    const UnsignedInt id = attributeFor(layerId, name);
+    const UnsignedInt id = findAttributeIdInternal(layerId, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attributeType(): attribute" << name << "not found in layer" << layer, {});
     return _data[layerOffset(layerId) + id]._data.type;
@@ -747,7 +747,7 @@ void* MaterialData::mutableAttribute(const UnsignedInt layer, const UnsignedInt
 const void* MaterialData::attribute(const UnsignedInt layer, const Containers::StringView name) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::attribute(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): attribute" << name << "not found in layer" << layer, {});
     return _data[layerOffset(layer) + id].value();
@@ -758,7 +758,7 @@ void* MaterialData::mutableAttribute(const UnsignedInt layer, const Containers::
         "Trade::MaterialData::mutableAttribute(): attribute data not mutable", {});
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::mutableAttribute(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): attribute" << name << "not found in layer" << layer, {});
     return const_cast<void*>(_data[layerOffset(layer) + id].value());
@@ -777,7 +777,7 @@ void* MaterialData::mutableAttribute(const UnsignedInt layer, const MaterialAttr
 }
 
 const void* MaterialData::attribute(const Containers::StringView layer, const UnsignedInt id) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): layer" << layer << "not found", {});
     CORRADE_ASSERT(id < attributeCount(layer),
@@ -788,7 +788,7 @@ const void* MaterialData::attribute(const Containers::StringView layer, const Un
 void* MaterialData::mutableAttribute(const Containers::StringView layer, const UnsignedInt id) {
     CORRADE_ASSERT(_attributeDataFlags & DataFlag::Mutable,
         "Trade::MaterialData::mutableAttribute(): attribute data not mutable", {});
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): layer" << layer << "not found", {});
     CORRADE_ASSERT(id < attributeCount(layer),
@@ -797,10 +797,10 @@ void* MaterialData::mutableAttribute(const Containers::StringView layer, const U
 }
 
 const void* MaterialData::attribute(const Containers::StringView layer, const Containers::StringView name) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): layer" << layer << "not found", {});
-    const UnsignedInt id = attributeFor(layerId, name);
+    const UnsignedInt id = findAttributeIdInternal(layerId, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): attribute" << name << "not found in layer" << layer, {});
     return _data[layerOffset(layerId) + id].value();
@@ -809,10 +809,10 @@ const void* MaterialData::attribute(const Containers::StringView layer, const Co
 void* MaterialData::mutableAttribute(const Containers::StringView layer, const Containers::StringView name) {
     CORRADE_ASSERT(_attributeDataFlags & DataFlag::Mutable,
         "Trade::MaterialData::mutableAttribute(): attribute data not mutable", {});
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): layer" << layer << "not found", {});
-    const UnsignedInt id = attributeFor(layerId, name);
+    const UnsignedInt id = findAttributeIdInternal(layerId, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): attribute" << name << "not found in layer" << layer, {});
     return const_cast<void*>(_data[layerOffset(layerId) + id].value());
@@ -901,7 +901,7 @@ template<> MAGNUM_TRADE_EXPORT Containers::MutableStringView MaterialData::mutab
 const void* MaterialData::tryAttribute(const UnsignedInt layer, const Containers::StringView name) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::tryAttribute(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     if(id == ~UnsignedInt{}) return nullptr;
     return _data[layerOffset(layer) + id].value();
 }
@@ -913,10 +913,10 @@ const void* MaterialData::tryAttribute(const UnsignedInt layer, const MaterialAt
 }
 
 const void* MaterialData::tryAttribute(const Containers::StringView layer, const Containers::StringView name) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::tryAttribute(): layer" << layer << "not found", {});
-    const UnsignedInt id = attributeFor(layerId, name);
+    const UnsignedInt id = findAttributeIdInternal(layerId, name);
     if(id == ~UnsignedInt{}) return nullptr;
     return _data[layerOffset(layerId) + id].value();
 }
diff --git a/src/Magnum/Trade/MaterialData.h b/src/Magnum/Trade/MaterialData.h
index ca3a9de7f..e4b96bbd9 100644
--- a/src/Magnum/Trade/MaterialData.h
+++ b/src/Magnum/Trade/MaterialData.h
@@ -2962,11 +2962,11 @@ class MAGNUM_TRADE_EXPORT MaterialData {
         static Containers::StringView layerString(MaterialLayer name);
         static Containers::StringView attributeString(MaterialAttribute name);
         /* Internal helpers that don't assert, unlike layerId() / attributeId() */
-        UnsignedInt layerFor(Containers::StringView layer) const;
+        UnsignedInt findLayerIdInternal(Containers::StringView layer) const;
         UnsignedInt layerOffset(UnsignedInt layer) const {
             return layer && _layerOffsets ? _layerOffsets[layer - 1] : 0;
         }
-        UnsignedInt attributeFor(UnsignedInt layer, Containers::StringView name) const;
+        UnsignedInt findAttributeIdInternal(UnsignedInt layer, Containers::StringView name) const;
 
         Containers::Array<MaterialAttributeData> _data;
         Containers::Array<UnsignedInt> _layerOffsets;
@@ -3141,7 +3141,7 @@ template<> Containers::MutableStringView MaterialData::mutableAttribute<Containe
 template<class T> T MaterialData::attribute(const UnsignedInt layer, const Containers::StringView name) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::attribute(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): attribute" << name << "not found in layer" << layer, {});
     return attribute<T>(layer, id);
@@ -3150,7 +3150,7 @@ template<class T> T MaterialData::attribute(const UnsignedInt layer, const Conta
 template<class T> typename std::conditional<std::is_same<T, Containers::MutableStringView>::value, Containers::MutableStringView, T&>::type MaterialData::mutableAttribute(const UnsignedInt layer, const Containers::StringView name) {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::mutableAttribute(): index" << layer << "out of range for" << layerCount() << "layers", *reinterpret_cast<T*>(this));
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): attribute" << name << "not found in layer" << layer, *reinterpret_cast<T*>(this));
     return mutableAttribute<T>(layer, id);
@@ -3169,7 +3169,7 @@ template<class T> typename std::conditional<std::is_same<T, Containers::MutableS
 }
 
 template<class T> T MaterialData::attribute(const Containers::StringView layer, const UnsignedInt id) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): layer" << layer << "not found", {});
     CORRADE_ASSERT(id < attributeCount(layer),
@@ -3178,7 +3178,7 @@ template<class T> T MaterialData::attribute(const Containers::StringView layer,
 }
 
 template<class T> typename std::conditional<std::is_same<T, Containers::MutableStringView>::value, Containers::MutableStringView, T&>::type MaterialData::mutableAttribute(const Containers::StringView layer, const UnsignedInt id) {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): layer" << layer << "not found", *reinterpret_cast<T*>(this));
     CORRADE_ASSERT(id < attributeCount(layer),
@@ -3187,20 +3187,20 @@ template<class T> typename std::conditional<std::is_same<T, Containers::MutableS
 }
 
 template<class T> T MaterialData::attribute(const Containers::StringView layer, const Containers::StringView name) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): layer" << layer << "not found", {});
-    const UnsignedInt id = attributeFor(layerId, name);
+    const UnsignedInt id = findAttributeIdInternal(layerId, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::attribute(): attribute" << name << "not found in layer" << layer, {});
     return attribute<T>(layerId, id);
 }
 
 template<class T> typename std::conditional<std::is_same<T, Containers::MutableStringView>::value, Containers::MutableStringView, T&>::type MaterialData::mutableAttribute(const Containers::StringView layer, const Containers::StringView name) {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): layer" << layer << "not found", *reinterpret_cast<T*>(this));
-    const UnsignedInt id = attributeFor(layerId, name);
+    const UnsignedInt id = findAttributeIdInternal(layerId, name);
     CORRADE_ASSERT(id != ~UnsignedInt{},
         "Trade::MaterialData::mutableAttribute(): attribute" << name << "not found in layer" << layer, *reinterpret_cast<T*>(this));
     return mutableAttribute<T>(layerId, id);
@@ -3257,7 +3257,7 @@ template<class T> typename std::conditional<std::is_same<T, Containers::MutableS
 template<class T> Containers::Optional<T> MaterialData::tryAttribute(const UnsignedInt layer, const Containers::StringView name) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::tryAttribute(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     if(id == ~UnsignedInt{}) return {};
     return attribute<T>(layer, id);
 }
@@ -3269,7 +3269,7 @@ template<class T> Containers::Optional<T> MaterialData::tryAttribute(const Unsig
 }
 
 template<class T> Containers::Optional<T> MaterialData::tryAttribute(const Containers::StringView layer, const Containers::StringView name) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::tryAttribute(): layer" << layer << "not found", {});
     return tryAttribute<T>(layerId, name);
@@ -3296,7 +3296,7 @@ template<class T> Containers::Optional<T> MaterialData::tryAttribute(const Mater
 template<class T> T MaterialData::attributeOr(const UnsignedInt layer, const Containers::StringView name, const T& defaultValue) const {
     CORRADE_ASSERT(layer < layerCount(),
         "Trade::MaterialData::attributeOr(): index" << layer << "out of range for" << layerCount() << "layers", {});
-    const UnsignedInt id = attributeFor(layer, name);
+    const UnsignedInt id = findAttributeIdInternal(layer, name);
     if(id == ~UnsignedInt{}) return defaultValue;
     return attribute<T>(layer, id);
 }
@@ -3308,7 +3308,7 @@ template<class T> T MaterialData::attributeOr(const UnsignedInt layer, const Mat
 }
 
 template<class T> T MaterialData::attributeOr(const Containers::StringView layer, const Containers::StringView name, const T& defaultValue) const {
-    const UnsignedInt layerId = layerFor(layer);
+    const UnsignedInt layerId = findLayerIdInternal(layer);
     CORRADE_ASSERT(layerId != ~UnsignedInt{},
         "Trade::MaterialData::attributeOr(): layer" << layer << "not found", {});
     return attributeOr<T>(layerId, name, defaultValue);