diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-14 17:06:02 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-14 17:06:02 +0300 |
commit | 6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d (patch) | |
tree | f1acb027394af1aec49790354df97da4665488b7 /src/utils | |
parent | a7d7346b9eb3fa62a8912e31d5c00f8e05390425 (diff) | |
download | manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.gz manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.bz2 manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.tar.xz manaplus-6b5c7e7a5ed32abfc98d9acdebacc50c68a91a1d.zip |
another fixes from cpplint.
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/checkutils.h | 2 | ||||
-rw-r--r-- | src/utils/gettext.h | 2 | ||||
-rw-r--r-- | src/utils/langs.h | 2 | ||||
-rw-r--r-- | src/utils/mathutils.h | 2 | ||||
-rw-r--r-- | src/utils/mutex.h | 4 | ||||
-rw-r--r-- | src/utils/paths.h | 2 | ||||
-rw-r--r-- | src/utils/perfomance.h | 10 | ||||
-rw-r--r-- | src/utils/physfstools.h | 4 | ||||
-rw-r--r-- | src/utils/process.h | 2 | ||||
-rw-r--r-- | src/utils/stringutils.h | 10 | ||||
-rw-r--r-- | src/utils/translation/podict.h | 4 | ||||
-rw-r--r-- | src/utils/translation/poparser.h | 2 | ||||
-rw-r--r-- | src/utils/translation/translationmanager.h | 2 | ||||
-rw-r--r-- | src/utils/xml.h | 4 |
14 files changed, 22 insertions, 30 deletions
diff --git a/src/utils/checkutils.h b/src/utils/checkutils.h index 9dad2a669..f55ecaece 100644 --- a/src/utils/checkutils.h +++ b/src/utils/checkutils.h @@ -29,4 +29,4 @@ bool reportFalseReal(const bool val, const char *const file, bool reportTrueReal(const bool val, const char *const file, const unsigned line); -#endif // UTILS_CHECKUTILS_H +#endif // UTILS_CHECKUTILS_H diff --git a/src/utils/gettext.h b/src/utils/gettext.h index c9ffd6c27..ed686cffd 100644 --- a/src/utils/gettext.h +++ b/src/utils/gettext.h @@ -42,4 +42,4 @@ #endif -#endif // UTILS_GETTEXT_H +#endif // UTILS_GETTEXT_H diff --git a/src/utils/langs.h b/src/utils/langs.h index a10fd72d7..a59712048 100644 --- a/src/utils/langs.h +++ b/src/utils/langs.h @@ -38,4 +38,4 @@ std::string getLangSimple() A_WARN_UNUSED; std::string getLangShort() A_WARN_UNUSED; -#endif // UTILS_LANGS_H +#endif // UTILS_LANGS_H diff --git a/src/utils/mathutils.h b/src/utils/mathutils.h index c58777d06..924a26fc4 100644 --- a/src/utils/mathutils.h +++ b/src/utils/mathutils.h @@ -132,4 +132,4 @@ inline int powerOfTwo(const int input) return value; } -#endif // UTILS_MATHUTILS_H +#endif // UTILS_MATHUTILS_H diff --git a/src/utils/mutex.h b/src/utils/mutex.h index 5eee6761c..03ecc9fe1 100644 --- a/src/utils/mutex.h +++ b/src/utils/mutex.h @@ -57,7 +57,7 @@ class Mutex class MutexLocker { public: - MutexLocker(Mutex *mutex); + explicit MutexLocker(Mutex *mutex); ~MutexLocker(); @@ -100,4 +100,4 @@ inline MutexLocker::~MutexLocker() mMutex->unlock(); } -#endif // MUTEX_H +#endif // MUTEX_H diff --git a/src/utils/paths.h b/src/utils/paths.h index 26a9dea27..b9cdcca3c 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -39,4 +39,4 @@ std::string getSelfName() A_WARN_UNUSED; std::string getDesktopDir() A_WARN_UNUSED; -#endif // UTILS_PATHS_H +#endif // UTILS_PATHS_H diff --git a/src/utils/perfomance.h b/src/utils/perfomance.h index bd441e06b..a70bc42a6 100644 --- a/src/utils/perfomance.h +++ b/src/utils/perfomance.h @@ -50,7 +50,7 @@ namespace Perfomance class Func { public: - Func(const std::string &str) : + explicit Func(const std::string &str) : name(str) { blockStart(str); @@ -63,14 +63,14 @@ namespace Perfomance std::string name; }; -} +} // namespace Perfomance -#else // USE_PROFILER +#else // USE_PROFILER #define PROFILER_START() #define BLOCK_START(name) #define BLOCK_END(name) #define FUNC_BLOCK(name, id) -#endif // USE_PROFILER -#endif // UTILS_PEFOMANCE_H +#endif // USE_PROFILER +#endif // UTILS_PEFOMANCE_H diff --git a/src/utils/physfstools.h b/src/utils/physfstools.h index 7bfe6b14d..0ad59e283 100644 --- a/src/utils/physfstools.h +++ b/src/utils/physfstools.h @@ -41,8 +41,8 @@ namespace PhysFs bool removeFromSearchPath(const char *oldDir); const char *getRealDir(const char *filename); bool mkdir(const char *dirName); -} +} // namespace PhysFs extern const char *dirSeparator; -#endif // UTILS_PHYSFS_H +#endif // UTILS_PHYSFS_H diff --git a/src/utils/process.h b/src/utils/process.h index 95c868372..c3de0d175 100644 --- a/src/utils/process.h +++ b/src/utils/process.h @@ -33,4 +33,4 @@ bool openBrowser(std::string url); void setPriority(const bool big); -#endif // UTILS_PROCESS_H +#endif // UTILS_PROCESS_H diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index 6aff503e2..9d1afe717 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -104,14 +104,6 @@ std::string strprintf(const char *const format, ...) A_WARN_UNUSED ; /** - * Removes bad characters from a string - * - * @param str the string to remove the bad chars from - * @return a reference to the string without bad chars - */ -//std::string &removeBadChars(std::string &str); - -/** * Removes colors from a string * * @param msg the string to remove the colors from @@ -229,4 +221,4 @@ std::string encodeLinkText(std::string data); std::string decodeLinkText(std::string data); -#endif // UTILS_STRINGUTILS_H +#endif // UTILS_STRINGUTILS_H diff --git a/src/utils/translation/podict.h b/src/utils/translation/podict.h index ba7b250d3..a39cee73f 100644 --- a/src/utils/translation/podict.h +++ b/src/utils/translation/podict.h @@ -31,7 +31,7 @@ typedef std::map <std::string, std::string> PoMap; class PoDict final { public: - PoDict(std::string lang); + explicit PoDict(std::string lang); A_DELETE_COPY(PoDict) @@ -60,4 +60,4 @@ class PoDict final extern PoDict *translator; -#endif // UTILS_TRANSLATION_PODICT_H +#endif // UTILS_TRANSLATION_PODICT_H diff --git a/src/utils/translation/poparser.h b/src/utils/translation/poparser.h index b5bbd03c5..1d13fa694 100644 --- a/src/utils/translation/poparser.h +++ b/src/utils/translation/poparser.h @@ -83,4 +83,4 @@ class PoParser final bool mReadingStr; }; -#endif // UTILS_TRANSLATION_POPARSER_H +#endif // UTILS_TRANSLATION_POPARSER_H diff --git a/src/utils/translation/translationmanager.h b/src/utils/translation/translationmanager.h index cc9c8b6a5..8a6f0c1e0 100644 --- a/src/utils/translation/translationmanager.h +++ b/src/utils/translation/translationmanager.h @@ -45,4 +45,4 @@ class TranslationManager final StringVect &lines); }; -#endif // UTILS_TRANSLATION_MANAGER_H +#endif // UTILS_TRANSLATION_MANAGER_H diff --git a/src/utils/xml.h b/src/utils/xml.h index 43065fa62..75f671b02 100644 --- a/src/utils/xml.h +++ b/src/utils/xml.h @@ -139,9 +139,9 @@ namespace XML void initXML(); void cleanupXML(); -} +} // namespace XML #define for_each_xml_child_node(var, parent) \ for (XmlNodePtr var = parent->xmlChildrenNode; var; var = var->next) -#endif // XML_H +#endif // XML_H |