ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Trade: use StringView bool conversion in assertions.

pull/570/head
Vladimír Vondruš 4 years ago
parent
0143ad45d9
commit
41717e7ef1
1 changed files with 36 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 72
      src/Magnum/Trade/MaterialData.cpp

72
src/Magnum/Trade/MaterialData.cpp
Unescape View File

@ -330,7 +330,7 @@ bool MaterialData::hasLayer(const Containers::StringView layer) const {
bool MaterialData::hasLayer(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::hasLayer(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::hasLayer(): invalid name" << layer, {});
return hasLayer(string);
}
@ -343,7 +343,7 @@ UnsignedInt MaterialData::layerId(const Containers::StringView layer) const {
UnsignedInt MaterialData::layerId(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::layerId(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::layerId(): invalid name" << layer, {});
return layerId(string);
}
@ -371,7 +371,7 @@ Float MaterialData::layerFactor(const Containers::StringView layer) const {
Float MaterialData::layerFactor(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::layerFactor(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::layerFactor(): invalid name" << layer, {});
return layerFactor(string);
}
@ -394,7 +394,7 @@ UnsignedInt MaterialData::layerFactorTexture(const Containers::StringView layer)
UnsignedInt MaterialData::layerFactorTexture(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::layerFactorTexture(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::layerFactorTexture(): invalid name" << layer, {});
return layerFactorTexture(string);
}
@ -421,7 +421,7 @@ MaterialTextureSwizzle MaterialData::layerFactorTextureSwizzle(const Containers:
MaterialTextureSwizzle MaterialData::layerFactorTextureSwizzle(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::layerFactorTextureSwizzle(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::layerFactorTextureSwizzle(): invalid name" << layer, {});
return layerFactorTextureSwizzle(string);
}
@ -454,7 +454,7 @@ Matrix3 MaterialData::layerFactorTextureMatrix(const Containers::StringView laye
Matrix3 MaterialData::layerFactorTextureMatrix(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::layerFactorTextureMatrix(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::layerFactorTextureMatrix(): invalid name" << layer, {});
return layerFactorTextureMatrix(string);
}
@ -487,7 +487,7 @@ UnsignedInt MaterialData::layerFactorTextureCoordinates(const Containers::String
UnsignedInt MaterialData::layerFactorTextureCoordinates(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::layerFactorTextureCoordinates(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::layerFactorTextureCoordinates(): invalid name" << layer, {});
return layerFactorTextureCoordinates(string);
}
@ -508,7 +508,7 @@ UnsignedInt MaterialData::attributeCount(const Containers::StringView layer) con
UnsignedInt MaterialData::attributeCount(const MaterialLayer layer) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeCount(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeCount(): invalid name" << layer, {});
return attributeCount(string);
}
@ -532,7 +532,7 @@ bool MaterialData::hasAttribute(const UnsignedInt layer, const Containers::Strin
bool MaterialData::hasAttribute(const UnsignedInt layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::hasAttribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::hasAttribute(): invalid name" << name, {});
return hasAttribute(layer, string);
}
@ -545,19 +545,19 @@ bool MaterialData::hasAttribute(const Containers::StringView layer, const Contai
bool MaterialData::hasAttribute(const Containers::StringView layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::hasAttribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::hasAttribute(): invalid name" << name, {});
return hasAttribute(layer, string);
}
bool MaterialData::hasAttribute(const MaterialLayer layer, const Containers::StringView name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::hasAttribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::hasAttribute(): invalid name" << layer, {});
return hasAttribute(string, name);
}
bool MaterialData::hasAttribute(const MaterialLayer layer, const MaterialAttribute name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::hasAttribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::hasAttribute(): invalid name" << layer, {});
return hasAttribute(string, name);
}
@ -572,7 +572,7 @@ UnsignedInt MaterialData::attributeId(const UnsignedInt layer, const Containers:
UnsignedInt MaterialData::attributeId(const UnsignedInt layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeId(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeId(): invalid name" << name, {});
return attributeId(layer, string);
}
@ -588,19 +588,19 @@ UnsignedInt MaterialData::attributeId(const Containers::StringView layer, const
UnsignedInt MaterialData::attributeId(const Containers::StringView layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeId(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeId(): invalid name" << name, {});
return attributeId(layer, string);
}
UnsignedInt MaterialData::attributeId(const MaterialLayer layer, const Containers::StringView name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeId(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeId(): invalid name" << layer, {});
return attributeId(string, name);
}
UnsignedInt MaterialData::attributeId(const MaterialLayer layer, const MaterialAttribute name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeId(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeId(): invalid name" << layer, {});
return attributeId(string, name);
}
@ -623,7 +623,7 @@ Containers::StringView MaterialData::attributeName(const Containers::StringView
Containers::StringView MaterialData::attributeName(const MaterialLayer layer, const UnsignedInt id) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeName(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeName(): invalid name" << layer, {});
return attributeName(string, id);
}
@ -646,7 +646,7 @@ MaterialAttributeType MaterialData::attributeType(const UnsignedInt layer, const
MaterialAttributeType MaterialData::attributeType(const UnsignedInt layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeType(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeType(): invalid name" << name, {});
return attributeType(layer, string);
}
@ -671,25 +671,25 @@ MaterialAttributeType MaterialData::attributeType(const Containers::StringView l
MaterialAttributeType MaterialData::attributeType(const Containers::StringView layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeType(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeType(): invalid name" << name, {});
return attributeType(layer, string);
}
MaterialAttributeType MaterialData::attributeType(const MaterialLayer layer, const UnsignedInt id) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeType(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeType(): invalid name" << layer, {});
return attributeType(string, id);
}
MaterialAttributeType MaterialData::attributeType(const MaterialLayer layer, const Containers::StringView name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeType(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeType(): invalid name" << layer, {});
return attributeType(string, name);
}
MaterialAttributeType MaterialData::attributeType(const MaterialLayer layer, const MaterialAttribute name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attributeType(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attributeType(): invalid name" << layer, {});
return attributeType(string, name);
}
@ -733,13 +733,13 @@ void* MaterialData::mutableAttribute(const UnsignedInt layer, const Containers::
const void* MaterialData::attribute(const UnsignedInt layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attribute(): invalid name" << name, {});
return attribute(layer, string);
}
void* MaterialData::mutableAttribute(const UnsignedInt layer, const MaterialAttribute name) {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::mutableAttribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::mutableAttribute(): invalid name" << name, {});
return mutableAttribute(layer, string);
}
@ -787,49 +787,49 @@ void* MaterialData::mutableAttribute(const Containers::StringView layer, const C
const void* MaterialData::attribute(const Containers::StringView layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attribute(): invalid name" << name, {});
return attribute(layer, string);
}
void* MaterialData::mutableAttribute(const Containers::StringView layer, const MaterialAttribute name) {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::mutableAttribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::mutableAttribute(): invalid name" << name, {});
return mutableAttribute(layer, string);
}
const void* MaterialData::attribute(const MaterialLayer layer, const UnsignedInt id) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attribute(): invalid name" << layer, {});
return attribute(string, id);
}
void* MaterialData::mutableAttribute(const MaterialLayer layer, const UnsignedInt id) {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::mutableAttribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::mutableAttribute(): invalid name" << layer, {});
return mutableAttribute(string, id);
}
const void* MaterialData::attribute(const MaterialLayer layer, const Containers::StringView name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attribute(): invalid name" << layer, {});
return attribute(string, name);
}
void* MaterialData::mutableAttribute(const MaterialLayer layer, const Containers::StringView name) {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::mutableAttribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::mutableAttribute(): invalid name" << layer, {});
return mutableAttribute(string, name);
}
const void* MaterialData::attribute(const MaterialLayer layer, const MaterialAttribute name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::attribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::attribute(): invalid name" << layer, {});
return attribute(string, name);
}
void* MaterialData::mutableAttribute(const MaterialLayer layer, const MaterialAttribute name) {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::mutableAttribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::mutableAttribute(): invalid name" << layer, {});
return mutableAttribute(string, name);
}
@ -875,7 +875,7 @@ const void* MaterialData::tryAttribute(const UnsignedInt layer, const Containers
const void* MaterialData::tryAttribute(const UnsignedInt layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::tryAttribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::tryAttribute(): invalid name" << name, {});
return tryAttribute(layer, string);
}
@ -890,19 +890,19 @@ const void* MaterialData::tryAttribute(const Containers::StringView layer, const
const void* MaterialData::tryAttribute(const Containers::StringView layer, const MaterialAttribute name) const {
const Containers::StringView string = attributeString(name);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::tryAttribute(): invalid name" << name, {});
CORRADE_ASSERT(string, "Trade::MaterialData::tryAttribute(): invalid name" << name, {});
return tryAttribute(layer, string);
}
const void* MaterialData::tryAttribute(const MaterialLayer layer, const Containers::StringView name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::tryAttribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::tryAttribute(): invalid name" << layer, {});
return tryAttribute(string, name);
}
const void* MaterialData::tryAttribute(const MaterialLayer layer, const MaterialAttribute name) const {
const Containers::StringView string = layerString(layer);
CORRADE_ASSERT(string.data(), "Trade::MaterialData::tryAttribute(): invalid name" << layer, {});
CORRADE_ASSERT(string, "Trade::MaterialData::tryAttribute(): invalid name" << layer, {});
return tryAttribute(string, name);
}

Write Preview
Loading…
Cancel
Save