summaryrefslogtreecommitdiff
path: root/src/gui/theme.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-27 22:00:04 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-27 22:00:04 +0300
commit64af3e6133b0f545cf1ad7ff565ee9e74e0d65b7 (patch)
treeec73490c822a9deed06ee9715e33cf43ce7acd69 /src/gui/theme.h
parentd18ddf95346d123fd048a99e487e36ee2a12e45b (diff)
downloadManaVerse-64af3e6133b0f545cf1ad7ff565ee9e74e0d65b7.tar.gz
ManaVerse-64af3e6133b0f545cf1ad7ff565ee9e74e0d65b7.tar.bz2
ManaVerse-64af3e6133b0f545cf1ad7ff565ee9e74e0d65b7.tar.xz
ManaVerse-64af3e6133b0f545cf1ad7ff565ee9e74e0d65b7.zip
improve theme class.
Diffstat (limited to 'src/gui/theme.h')
-rw-r--r--src/gui/theme.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/theme.h b/src/gui/theme.h
index ca577ac9e..231a32ce2 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -22,8 +22,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef SKIN_H
-#define SKIN_H
+#ifndef THEME_H
+#define THEME_H
#include "configlistener.h"
#include "graphics.h"
@@ -205,10 +205,10 @@ class Theme final : public Palette, public ConfigListener
const int w,
const int h) A_WARN_UNUSED;
- ImageSet *getImageSetFromThemeXml(const std::string &name,
+ static ImageSet *getImageSetFromThemeXml(const std::string &name,
const std::string &name2,
const int w,
- const int h) const A_WARN_UNUSED;
+ const int h)A_WARN_UNUSED;
enum ThemePalette
{
BROWSERBOX = 0,
@@ -493,7 +493,7 @@ class Theme final : public Palette, public ConfigListener
static std::string mScreenDensity;
static Theme *mInstance;
- static bool tryThemePath(std::string themePath) A_WARN_UNUSED;
+ static bool tryThemePath(const std::string &themePath) A_WARN_UNUSED;
void loadColors(std::string file = "");