diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/util/enriched_string.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/util/enriched_string.h')
| -rw-r--r-- | src/util/enriched_string.h | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/src/util/enriched_string.h b/src/util/enriched_string.h index c8a095887..9bcccc060 100644 --- a/src/util/enriched_string.h +++ b/src/util/enriched_string.h @@ -23,15 +23,18 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <vector> #include <SColor.h> -class EnrichedString { +class EnrichedString +{ public: EnrichedString(); EnrichedString(const std::wstring &s, - const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255)); + const irr::video::SColor &color = irr::video::SColor( + 255, 255, 255, 255)); EnrichedString(const wchar_t *str, - const irr::video::SColor &color = irr::video::SColor(255, 255, 255, 255)); + const irr::video::SColor &color = irr::video::SColor( + 255, 255, 255, 255)); EnrichedString(const std::wstring &string, - const std::vector<irr::video::SColor> &colors); + const std::vector<irr::video::SColor> &colors); void clear(); void operator=(const wchar_t *str); void addAtEnd(const std::wstring &s, const irr::video::SColor &color); @@ -67,23 +70,11 @@ public: { return !(*this == other); } - inline bool empty() const - { - return m_string.empty(); - } - inline size_t size() const - { - return m_string.size(); - } + inline bool empty() const { return m_string.empty(); } + inline size_t size() const { return m_string.size(); } - inline bool hasBackground() const - { - return m_has_background; - } - inline irr::video::SColor getBackground() const - { - return m_background; - } + inline bool hasBackground() const { return m_has_background; } + inline irr::video::SColor getBackground() const { return m_background; } inline void setBackground(const irr::video::SColor &color) { m_background = color; |