summaryrefslogtreecommitdiff
path: root/src/resources/theme.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/resources/theme.h
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadMana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
Mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
Mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
Mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/resources/theme.h')
-rw-r--r--src/resources/theme.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/resources/theme.h b/src/resources/theme.h
index ae795ed4..434bd6d8 100644
--- a/src/resources/theme.h
+++ b/src/resources/theme.h
@@ -107,7 +107,7 @@ class Theme : public Palette, public EventListener
static void deleteInstance();
static void prepareThemePath();
- static std::string getThemePath() { return mThemePath; }
+ static const std::string &getThemePath() { return mThemePath; }
/**
* Returns the patch to the given gui resource relative to the theme
@@ -227,10 +227,7 @@ class Theme : public Palette, public EventListener
Skin *readSkin(const std::string &filename);
// Map containing all window skins
- using Skins = std::map<std::string, Skin *>;
- using SkinIterator = Skins::iterator;
-
- Skins mSkins;
+ std::map<std::string, Skin *> mSkins;
static std::string mThemePath;
static Theme *mInstance;
@@ -245,8 +242,7 @@ class Theme : public Palette, public EventListener
*/
float mMinimumOpacity;
- using ProgressColors = std::vector<DyePalette *>;
- ProgressColors mProgressColors;
+ std::vector<DyePalette *> mProgressColors;
};
#endif