diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/util/enriched_string.h | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.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, 20 insertions, 11 deletions
diff --git a/src/util/enriched_string.h b/src/util/enriched_string.h index 9bcccc060..c8a095887 100644 --- a/src/util/enriched_string.h +++ b/src/util/enriched_string.h @@ -23,18 +23,15 @@ 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); @@ -70,11 +67,23 @@ 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; |