diff options
| -rw-r--r-- | src/actormanager.h | 2 | ||||
| -rw-r--r-- | src/client.h | 4 | ||||
| -rw-r--r-- | src/dirs.cpp | 4 | ||||
| -rw-r--r-- | src/dirs.h | 4 | ||||
| -rw-r--r-- | src/navigationmanager.h | 4 | ||||
| -rw-r--r-- | src/particle/particle.h | 3 | ||||
| -rw-r--r-- | src/spellmanager.h | 2 | ||||
| -rw-r--r-- | src/utils/stringutils.h | 2 |
8 files changed, 16 insertions, 9 deletions
diff --git a/src/actormanager.h b/src/actormanager.h index 9646a3cee..4a50e4571 100644 --- a/src/actormanager.h +++ b/src/actormanager.h @@ -217,7 +217,7 @@ class ActorManager final: public ConfigListener /** * Returns the whole list of beings. */ - const ActorSprites &getAll() const; + const ActorSprites &getAll() const A_CONST; /** * Returns true if the given ActorSprite is in the manager's list, diff --git a/src/client.h b/src/client.h index 8ffad378c..7930d6c90 100644 --- a/src/client.h +++ b/src/client.h @@ -115,7 +115,11 @@ class Client final : public ConfigListener, void testsClear(); +#ifdef ANDROID static void logVars(); +#else + static void logVars() A_CONST; +#endif void stateConnectGame1(); diff --git a/src/dirs.cpp b/src/dirs.cpp index f1c9e9550..bcdea060c 100644 --- a/src/dirs.cpp +++ b/src/dirs.cpp @@ -168,8 +168,7 @@ void Dirs::updateDataPath() void Dirs::extractDataDir() { -#ifdef ANDROID -#ifdef USE_SDL2 +#if defined(ANDROID) && defined(USE_SDL2) Files::setCopyCallBack(&updateProgress); resetProgress(); extractAssets(); @@ -183,7 +182,6 @@ void Dirs::extractDataDir() Files::extractZip(zipName, "data", dirName); Files::extractLocale(); #endif -#endif } void Dirs::mountDataDir() diff --git a/src/dirs.h b/src/dirs.h index 95a5fd9e7..2d5650dc3 100644 --- a/src/dirs.h +++ b/src/dirs.h @@ -32,7 +32,11 @@ class Dirs final static void updateDataPath(); +#if defined(ANDROID) && defined(USE_SDL2) static void extractDataDir(); +#else + static void extractDataDir() A_CONST; +#endif static void mountDataDir(); diff --git a/src/navigationmanager.h b/src/navigationmanager.h index c7be1a053..3c907bb6f 100644 --- a/src/navigationmanager.h +++ b/src/navigationmanager.h @@ -31,11 +31,11 @@ struct MetaTile; class NavigationManager final { public: - NavigationManager(); + NavigationManager() A_CONST; A_DELETE_COPY(NavigationManager) - ~NavigationManager(); + ~NavigationManager() A_CONST; #ifndef DYECMD static Resource *loadWalkLayer(const Map *const map); diff --git a/src/particle/particle.h b/src/particle/particle.h index e33bb986c..3e396a1c0 100644 --- a/src/particle/particle.h +++ b/src/particle/particle.h @@ -95,7 +95,8 @@ class Particle notfinal : public Actor */ virtual void draw(Graphics *const graphics, const int offsetX, - const int offsetY) const override A_NONNULL(2); + const int offsetY) const override + A_CONST A_NONNULL(2); /** * Necessary for sorting with the other sprites. diff --git a/src/spellmanager.h b/src/spellmanager.h index eb0396aaa..9af468505 100644 --- a/src/spellmanager.h +++ b/src/spellmanager.h @@ -45,7 +45,7 @@ class SpellManager final TextCommand *createNewSpell() const A_WARN_UNUSED; - const std::vector<TextCommand*> &getAll() const A_WARN_UNUSED; + const std::vector<TextCommand*> &getAll() const A_CONST A_WARN_UNUSED; void useItem(const int itemId) const; diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 31f562587..e35cacca4 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -138,7 +138,7 @@ int compareStrI(const std::string &a, const std::string &b) A_WARN_UNUSED; /** * Tells wether the character is a word separator. */ -bool isWordSeparator(const signed char chr) A_WARN_UNUSED; +bool isWordSeparator(const signed char chr) A_CONST A_WARN_UNUSED; size_t findI(std::string str, std::string subStr) A_WARN_UNUSED; |