summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-12-17 19:20:26 +0300
committerAndrei Karas <akaras@inbox.ru>2013-12-17 19:20:26 +0300
commitfc0c65bbf1b297431f77e1a91dcdb528e38ff0fb (patch)
treea8697ad34e2915aa829a996f61a83c719be50999
parentac51e9e9d85ef6a590b6ed0e4491056b38169d78 (diff)
downloadplus-fc0c65bbf1b297431f77e1a91dcdb528e38ff0fb.tar.gz
plus-fc0c65bbf1b297431f77e1a91dcdb528e38ff0fb.tar.bz2
plus-fc0c65bbf1b297431f77e1a91dcdb528e38ff0fb.tar.xz
plus-fc0c65bbf1b297431f77e1a91dcdb528e38ff0fb.zip
add restrict into theme.
-rw-r--r--src/gui/theme.cpp6
-rw-r--r--src/gui/theme.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index fb69dce3b..183ef13a6 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -60,10 +60,10 @@ static void initDefaultThemePath()
defaultThemePath = "themes/";
}
-Skin::Skin(ImageRect *skin, const ImageRect *images,
+Skin::Skin(ImageRect *restrict skin, const ImageRect *restrict images,
const std::string &filePath, const std::string &name,
const int padding, const int titlePadding,
- std::map<std::string, int> *const options):
+ std::map<std::string, int> *restrict const options):
instances(1),
mFilePath(filePath),
mName(name),
@@ -276,7 +276,7 @@ gcn::Color Theme::getProgressColor(const int type, const float progress)
}
Skin *Theme::load(const std::string &filename, const std::string &filename2,
- const bool full, const std::string &defaultPath)
+ const bool full, const std::string &restrict defaultPath)
{
// Check if this skin was already loaded
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 0ed889794..564c94bb5 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -75,10 +75,10 @@ struct ThemeInfo final
class Skin final
{
public:
- Skin(ImageRect *skin, const ImageRect *images,
+ Skin(ImageRect *restrict skin, const ImageRect *restrict images,
const std::string &filePath, const std::string &name = "",
const int padding = 3, const int titlePadding = 4,
- std::map<std::string, int> *const options = nullptr);
+ std::map<std::string, int> *restrict const options = nullptr);
A_DELETE_COPY(Skin)
@@ -467,7 +467,7 @@ class Theme final : public Palette, public ConfigListener
*/
Skin *load(const std::string &filename, const std::string &filename2,
const bool full = true, const std::string
- &defaultPath = getThemePath()) A_WARN_UNUSED;
+ &restrict defaultPath = getThemePath()) A_WARN_UNUSED;
Skin *loadSkinRect(ImageRect &image, const std::string &name,
const std::string &name2, const int start = 0,