From f7f639465afc78bf97dbd30bfbd960f57c4bf3e2 Mon Sep 17 00:00:00 2001 From: PKEuS Date: Wed, 4 Jun 2014 22:27:51 +0200 Subject: [PATCH] Fixed remaining VS warnings (hopefully all of them, this time) --- cli/cmdlineparser.cpp | 14 +++++++------- cli/cppcheckexecutor.cpp | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp index 5be645b09..8eef9d9a9 100644 --- a/cli/cmdlineparser.cpp +++ b/cli/cmdlineparser.cpp @@ -507,24 +507,24 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[]) Library::Error err = _settings->library.load(argv[0], argv[i]+10); std::string errmsg; switch (err.errorcode) { - case Library::ErrorCode::OK: + case Library::OK: break; - case Library::ErrorCode::FILE_NOT_FOUND: + case Library::FILE_NOT_FOUND: errmsg = "File not found"; break; - case Library::ErrorCode::BAD_XML: + case Library::BAD_XML: errmsg = "Bad XML"; break; - case Library::ErrorCode::BAD_ELEMENT: + case Library::BAD_ELEMENT: errmsg = "Unexpected element"; break; - case Library::ErrorCode::MISSING_ATTRIBUTE: + case Library::MISSING_ATTRIBUTE: errmsg = "Missing attribute"; break; - case Library::ErrorCode::BAD_ATTRIBUTE: + case Library::BAD_ATTRIBUTE: errmsg = "Bad attribute"; break; - case Library::ErrorCode::BAD_ATTRIBUTE_VALUE: + case Library::BAD_ATTRIBUTE_VALUE: errmsg = "Bad attribute value"; break; } diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp index 6ac4f0dc2..dfb453ec1 100644 --- a/cli/cppcheckexecutor.cpp +++ b/cli/cppcheckexecutor.cpp @@ -483,10 +483,10 @@ int CppCheckExecutor::check_internal(CppCheck& cppcheck, int /*argc*/, const cha { Settings& settings = cppcheck.settings(); _settings = &settings; - bool std = (settings.library.load(argv[0], "std.cfg").errorcode == Library::ErrorCode::OK); + bool std = (settings.library.load(argv[0], "std.cfg").errorcode == Library::OK); bool posix = true; if (settings.standards.posix) - posix = (settings.library.load(argv[0], "posix.cfg").errorcode == Library::ErrorCode::OK); + posix = (settings.library.load(argv[0], "posix.cfg").errorcode == Library::OK); if (!std || !posix) { const std::list callstack;