diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-07 18:37:50 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-07 18:37:50 +0300 |
| commit | 3dbdda0d3070a093f8a341f897ce4310a8b52bd2 (patch) | |
| tree | ddb5a48767c97cbb95e8204acfeb667483477051 /src/resources/mapreader.h | |
| parent | 3173688b7c1a1027257aa057039bd50738ac8bb5 (diff) | |
| download | manaplus-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.tar.gz manaplus-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.tar.bz2 manaplus-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.tar.xz manaplus-3dbdda0d3070a093f8a341f897ce4310a8b52bd2.zip | |
Add some missing nonnull attributes to map/maplayer classes.
Diffstat (limited to 'src/resources/mapreader.h')
| -rw-r--r-- | src/resources/mapreader.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/resources/mapreader.h b/src/resources/mapreader.h index 7afd72109..27fc44271 100644 --- a/src/resources/mapreader.h +++ b/src/resources/mapreader.h @@ -60,7 +60,8 @@ class MapReader final /** * Reads a map layer and adds it to the given map. */ - static void readLayer(const XmlNodePtr node, Map *const map); + static void readLayer(const XmlNodePtr node, + Map *const map) A_NONNULL(2); private: /** @@ -71,7 +72,7 @@ class MapReader final * be assigned. */ static void readProperties(const XmlNodePtrConst node, - Properties *const props); + Properties *const props) A_NONNULL(2); static bool readBase64Layer(const XmlNodePtrConst childNode, Map *const map, @@ -80,7 +81,7 @@ class MapReader final MapHeights *const heights, const std::string &compression, int &restrict x, int &restrict y, - const int w, const int h); + const int w, const int h) A_NONNULL(2); static bool readCsvLayer(const XmlNodePtrConst childNode, Map *const map, @@ -88,16 +89,16 @@ class MapReader final const MapLayer::Type &layerType, MapHeights *const heights, int &restrict x, int &restrict y, - const int w, const int h); + const int w, const int h) A_NONNULL(2); /** * Reads a tile set. */ static Tileset *readTileset(XmlNodePtr node, const std::string &path, - Map *const map) A_WARN_UNUSED; + Map *const map) A_WARN_UNUSED A_NONNULL(3); - static void updateMusic(Map *const map); + static void updateMusic(Map *const map) A_NONNULL(1); static void addLayerToList(const std::string &fileName); |