diff options
| -rw-r--r-- | src/actormanager.h | 6 | ||||
| -rw-r--r-- | src/gui/color.h | 5 | ||||
| -rw-r--r-- | src/gui/skin.h | 6 | ||||
| -rw-r--r-- | src/gui/windows/whoisonline.h | 6 | ||||
| -rw-r--r-- | src/resources/imagehelper.h | 3 | ||||
| -rw-r--r-- | src/resources/iteminfo.h | 3 | ||||
| -rw-r--r-- | src/resources/sdl2softwareimagehelper.h | 3 |
7 files changed, 22 insertions, 10 deletions
diff --git a/src/actormanager.h b/src/actormanager.h index bb00f1e5b..3f919087d 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -331,7 +331,8 @@ class ActorManager final: public ConfigListener bool isIn##list1##List(const std::string &name) const A_WARN_UNUSED\ { return m##list1##mob##Set.find(name) != m##list1##mob##Set.end(); }\ void rebuild##list1##mob();\ - std::set<std::string> get##list1##mob##Set() const noexcept2 A_WARN_UNUSED\ + std::set<std::string> get##list1##mob##Set() const noexcept2\ + A_WARN_UNUSED\ { return m##list1##mob##Set; }\ std::list<std::string> get##list1##mob() const noexcept2 A_WARN_UNUSED\ { return m##list1##mob; } @@ -345,7 +346,8 @@ class ActorManager final: public ConfigListener const StringIntMap &getAttackMobsMap() const noexcept2 A_WARN_UNUSED { return mAttackMobsMap; } - const StringIntMap &getPriorityAttackMobsMap() const noexcept2 A_WARN_UNUSED + const StringIntMap &getPriorityAttackMobsMap() const noexcept2 + A_WARN_UNUSED { return mPriorityAttackMobsMap; } int getAttackMobIndex(const std::string &name) const A_WARN_UNUSED; diff --git a/src/gui/color.h b/src/gui/color.h index c6c3accbc..e81757adc 100644 --- a/src/gui/color.h +++ b/src/gui/color.h @@ -215,7 +215,10 @@ class Color final */ constexpr bool operator!=(const Color& color) const { - return !(r == color.r && g == color.g && b == color.b && a == color.a); + return !(r == color.r && + g == color.g && + b == color.b && + a == color.a); } /** diff --git a/src/gui/skin.h b/src/gui/skin.h index a0b33fe53..74f248e99 100644 --- a/src/gui/skin.h +++ b/src/gui/skin.h @@ -70,13 +70,15 @@ class Skin final /** * Returns the image used by a close button for this skin. */ - const Image *getCloseImage(const bool state) const noexcept2 A_WARN_UNUSED + const Image *getCloseImage(const bool state) const + noexcept2 A_WARN_UNUSED { return state ? mCloseImageHighlighted : mCloseImage; } /** * Returns the image used by a sticky button for this skin. */ - const Image *getStickyImage(const bool state) const noexcept2 A_WARN_UNUSED + const Image *getStickyImage(const bool state) const + noexcept2 A_WARN_UNUSED { return state ? mStickyImageDown : mStickyImageUp; } /** diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index b5aee4cf8..0f0aa88b5 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -78,10 +78,12 @@ class WhoIsOnline final : public Window, void widgetResized(const Event &event) override final; - const std::set<OnlinePlayer*> &getOnlinePlayers() const noexcept2 A_WARN_UNUSED + const std::set<OnlinePlayer*> &getOnlinePlayers() const noexcept2 + A_WARN_UNUSED { return mOnlinePlayers; } - const std::set<std::string> &getOnlineNicks() const noexcept2 A_WARN_UNUSED + const std::set<std::string> &getOnlineNicks() const noexcept2 + A_WARN_UNUSED { return mOnlineNicks; } void setAllowUpdate(const bool n) noexcept2 diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index 4ade89199..90a28330e 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -96,7 +96,8 @@ class ImageHelper notfinal static SDL_Surface *loadPng(SDL_RWops *const rw); - constexpr static void setOpenGlMode(const RenderType useOpenGL) noexcept2 + constexpr static void setOpenGlMode(const RenderType useOpenGL) + noexcept2 { mUseOpenGL = useOpenGL; } virtual RenderType useOpenGL() const noexcept2 A_WARN_UNUSED diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h index 409978ebc..7bcc8d673 100644 --- a/src/resources/iteminfo.h +++ b/src/resources/iteminfo.h @@ -159,7 +159,8 @@ class ItemInfo final void setMissileParticleFile(const std::string &s) noexcept2 { mMissileParticleFile = s; } - const std::string &getMissileParticleFile() const noexcept2 A_WARN_UNUSED + const std::string &getMissileParticleFile() const noexcept2 + A_WARN_UNUSED { return mMissileParticleFile; } void setHitEffectId(const int s) noexcept2 diff --git a/src/resources/sdl2softwareimagehelper.h b/src/resources/sdl2softwareimagehelper.h index 38bd0f9d0..6db14868f 100644 --- a/src/resources/sdl2softwareimagehelper.h +++ b/src/resources/sdl2softwareimagehelper.h @@ -74,7 +74,8 @@ class SDL2SoftwareImageHelper final : public ImageHelper SDL_Surface *restrict const dst, SDL_Rect *restrict const dstrect); - constexpr2 static void setFormat(SDL_PixelFormat *const format) noexcept2 + constexpr2 static void setFormat(SDL_PixelFormat *const format) + noexcept2 { mFormat = format; if (mFormat) |