From 8cc7131ee9392d74e07751f1003e5b660d83deb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 21 Apr 2018 13:28:26 +0200 Subject: [PATCH] Rename CppCheck::processFile to CppCheck::checkFile --- lib/cppcheck.cpp | 8 ++++---- lib/cppcheck.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp index 225bc8854..33aa78883 100644 --- a/lib/cppcheck.cpp +++ b/lib/cppcheck.cpp @@ -80,13 +80,13 @@ const char * CppCheck::extraVersion() unsigned int CppCheck::check(const std::string &path) { std::ifstream fin(path); - return processFile(Path::simplifyPath(path), emptyString, fin); + return checkFile(Path::simplifyPath(path), emptyString, fin); } unsigned int CppCheck::check(const std::string &path, const std::string &content) { std::istringstream iss(content); - return processFile(Path::simplifyPath(path), emptyString, iss); + return checkFile(Path::simplifyPath(path), emptyString, iss); } unsigned int CppCheck::check(const ImportProject::FileSettings &fs) @@ -102,10 +102,10 @@ unsigned int CppCheck::check(const ImportProject::FileSettings &fs) temp._settings.platform(fs.platformType); } std::ifstream fin(fs.filename); - return temp.processFile(Path::simplifyPath(fs.filename), fs.cfg, fin); + return temp.checkFile(Path::simplifyPath(fs.filename), fs.cfg, fin); } -unsigned int CppCheck::processFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream) +unsigned int CppCheck::checkFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream) { exitcode = 0; diff --git a/lib/cppcheck.h b/lib/cppcheck.h index 4758e1a57..3dc25715b 100644 --- a/lib/cppcheck.h +++ b/lib/cppcheck.h @@ -149,13 +149,13 @@ private: void internalError(const std::string &filename, const std::string &msg); /** - * @brief Process one file. + * @brief Check a file using stream * @param filename file name * @param cfgname cfg name * @param fileStream stream the file content can be read from - * @return amount of errors found + * @return number of errors found */ - unsigned int processFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream); + unsigned int checkFile(const std::string& filename, const std::string &cfgname, std::istream& fileStream); /** * @brief Check raw tokens