From 34bd6e0b8e0fb74cc416550a52e6406c47fefea6 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 22 Aug 2016 19:35:22 +0300 Subject: Add some missing consts. --- src/resources/loaders/atlasloader.cpp | 2 +- src/resources/loaders/emptyatlasloader.cpp | 2 +- src/resources/loaders/imagesetloader.cpp | 6 +++--- src/resources/loaders/musicloader.cpp | 2 +- src/resources/loaders/rescaledloader.cpp | 6 +++--- src/resources/loaders/soundloader.cpp | 2 +- src/resources/loaders/spritedefloader.cpp | 4 ++-- src/resources/loaders/subimageloader.cpp | 8 +++++--- src/resources/loaders/subimagesetloader.cpp | 2 +- src/resources/loaders/walklayerloader.cpp | 2 +- 10 files changed, 19 insertions(+), 17 deletions(-) (limited to 'src/resources/loaders') diff --git a/src/resources/loaders/atlasloader.cpp b/src/resources/loaders/atlasloader.cpp index 4a0991c21..3d05972eb 100644 --- a/src/resources/loaders/atlasloader.cpp +++ b/src/resources/loaders/atlasloader.cpp @@ -34,7 +34,7 @@ struct AtlasLoader final { const std::string name; - const StringVect *files; + const StringVect *const files; static Resource *load(const void *const v) { diff --git a/src/resources/loaders/emptyatlasloader.cpp b/src/resources/loaders/emptyatlasloader.cpp index ca798d681..3b8ef9078 100644 --- a/src/resources/loaders/emptyatlasloader.cpp +++ b/src/resources/loaders/emptyatlasloader.cpp @@ -34,7 +34,7 @@ struct EmptyAtlasLoader final { const std::string name; - const StringVect *files; + const StringVect *const files; static Resource *load(const void *const v) { diff --git a/src/resources/loaders/imagesetloader.cpp b/src/resources/loaders/imagesetloader.cpp index 47c4dcb45..590739490 100644 --- a/src/resources/loaders/imagesetloader.cpp +++ b/src/resources/loaders/imagesetloader.cpp @@ -36,9 +36,9 @@ struct ImageSetLoader final { - std::string path; - int w; - int h; + const std::string path; + const int w; + const int h; static Resource *load(const void *const v) { if (!v) diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index f9dd0fb17..d994be547 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -35,7 +35,7 @@ namespace { struct ResourceLoader final { - std::string path; + const std::string path; static Resource *load(const void *const v) { diff --git a/src/resources/loaders/rescaledloader.cpp b/src/resources/loaders/rescaledloader.cpp index 80400d728..f9f11c9d6 100644 --- a/src/resources/loaders/rescaledloader.cpp +++ b/src/resources/loaders/rescaledloader.cpp @@ -35,9 +35,9 @@ namespace { struct RescaledLoader final { - const Image *image; - int width; - int height; + const Image *const image; + const int width; + const int height; static Resource *load(const void *const v) { if (!v) diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index 8c325db7c..7ec18063e 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -35,7 +35,7 @@ namespace { struct ResourceLoader final { - std::string path; + const std::string path; static Resource *load(const void *const v) { diff --git a/src/resources/loaders/spritedefloader.cpp b/src/resources/loaders/spritedefloader.cpp index d49955ac4..3cbb03652 100644 --- a/src/resources/loaders/spritedefloader.cpp +++ b/src/resources/loaders/spritedefloader.cpp @@ -36,8 +36,8 @@ namespace { struct SpriteDefLoader final { - std::string path; - int variant; + const std::string path; + const int variant; static Resource *load(const void *const v) { if (!v) diff --git a/src/resources/loaders/subimageloader.cpp b/src/resources/loaders/subimageloader.cpp index 0be91e942..5b014362b 100644 --- a/src/resources/loaders/subimageloader.cpp +++ b/src/resources/loaders/subimageloader.cpp @@ -35,9 +35,11 @@ namespace { struct SubImageLoader final { - Image *parent; - int x, y; - int width, height; + Image *const parent; + const int x; + const int y; + const int width; + const int height; static Resource *load(const void *const v) { if (!v) diff --git a/src/resources/loaders/subimagesetloader.cpp b/src/resources/loaders/subimagesetloader.cpp index 1b271b33f..649a4f223 100644 --- a/src/resources/loaders/subimagesetloader.cpp +++ b/src/resources/loaders/subimagesetloader.cpp @@ -36,7 +36,7 @@ namespace { struct SubImageSetLoader final { - Image *parent; + Image *const parent; int width; int height; static Resource *load(const void *const v) diff --git a/src/resources/loaders/walklayerloader.cpp b/src/resources/loaders/walklayerloader.cpp index e7ffa2275..73f451ad8 100644 --- a/src/resources/loaders/walklayerloader.cpp +++ b/src/resources/loaders/walklayerloader.cpp @@ -36,7 +36,7 @@ struct WalkLayerLoader final { const std::string name; - Map *map; + const Map *const map; static Resource *load(const void *const v) { -- cgit v1.2.3-60-g2f50