diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-04-23 09:52:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-23 09:52:40 +0200 |
| commit | 91a9382c25328075d1a27593b22b0a75863951e1 (patch) | |
| tree | c0806621a7af000f31360a78d486d8e25f3bf52f /src/metadata.cpp | |
| parent | 0c34fe20a101f3e9297b3ffab4e8b736a55a558f (diff) | |
| download | minetest-91a9382c25328075d1a27593b22b0a75863951e1.tar.gz minetest-91a9382c25328075d1a27593b22b0a75863951e1.tar.bz2 minetest-91a9382c25328075d1a27593b22b0a75863951e1.zip | |
Pass clang-format on various cpp/header files (#5559)
Diffstat (limited to 'src/metadata.cpp')
| -rw-r--r-- | src/metadata.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/metadata.cpp b/src/metadata.cpp index 2ce9af5af..833735464 100644 --- a/src/metadata.cpp +++ b/src/metadata.cpp @@ -64,8 +64,7 @@ bool Metadata::operator==(const Metadata &other) const return true; } -const std::string &Metadata::getString(const std::string &name, - u16 recursion) const +const std::string &Metadata::getString(const std::string &name, u16 recursion) const { StringMap::const_iterator it = m_stringvars.find(name); if (it == m_stringvars.end()) { @@ -99,11 +98,9 @@ bool Metadata::setString(const std::string &name, const std::string &var) return true; } -const std::string &Metadata::resolveString(const std::string &str, - u16 recursion) const +const std::string &Metadata::resolveString(const std::string &str, u16 recursion) const { - if (recursion <= 1 && - str.substr(0, 2) == "${" && str[str.length() - 1] == '}') { + if (recursion <= 1 && str.substr(0, 2) == "${" && str[str.length() - 1] == '}') { return getString(str.substr(2, str.length() - 3), recursion + 1); } else { return str; |