From b12b7f93e4a5e318deebdf3aafa00cb916d2600c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sun, 17 Jun 2018 07:59:48 +0200 Subject: [PATCH] Rename _symbolNames --- lib/errorlogger.cpp | 14 +++++++------- lib/errorlogger.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp index fe6b80ab1..8eb22cfd8 100644 --- a/lib/errorlogger.cpp +++ b/lib/errorlogger.cpp @@ -198,12 +198,12 @@ void ErrorLogger::ErrorMessage::setmsg(const std::string &msg) // If there is no newline then both the summary and verbose messages // are the given message const std::string::size_type pos = msg.find('\n'); - const std::string symbolName = _symbolNames.empty() ? std::string() : _symbolNames.substr(0, _symbolNames.find('\n')); + const std::string symbolName = mSymbolNames.empty() ? std::string() : mSymbolNames.substr(0, mSymbolNames.find('\n')); if (pos == std::string::npos) { mShortMessage = replaceStr(msg, "$symbol", symbolName); mVerboseMessage = replaceStr(msg, "$symbol", symbolName); } else if (msg.compare(0,8,"$symbol:") == 0) { - _symbolNames += msg.substr(8, pos-7); + mSymbolNames += msg.substr(8, pos-7); setmsg(msg.substr(pos + 1)); } else { mShortMessage = replaceStr(msg.substr(0, pos), "$symbol", symbolName); @@ -220,7 +220,7 @@ Suppressions::ErrorMessage ErrorLogger::ErrorMessage::toSuppressionsErrorMessage ret.lineNumber = _callStack.back().line; } ret.inconclusive = _inconclusive; - ret.symbolNames = _symbolNames; + ret.symbolNames = mSymbolNames; return ret; } @@ -406,14 +406,14 @@ std::string ErrorLogger::ErrorMessage::toXML() const printer.PushAttribute("info", it->getinfo().c_str()); printer.CloseElement(false); } - for (std::string::size_type pos = 0; pos < _symbolNames.size();) { - const std::string::size_type pos2 = _symbolNames.find('\n', pos); + for (std::string::size_type pos = 0; pos < mSymbolNames.size();) { + const std::string::size_type pos2 = mSymbolNames.find('\n', pos); std::string symbolName; if (pos2 == std::string::npos) { - symbolName = _symbolNames.substr(pos); + symbolName = mSymbolNames.substr(pos); pos = pos2; } else { - symbolName = _symbolNames.substr(pos, pos2-pos); + symbolName = mSymbolNames.substr(pos, pos2-pos); pos = pos2 + 1; } printer.OpenElement("symbol", false); diff --git a/lib/errorlogger.h b/lib/errorlogger.h index 76d5c5f0d..0692c40ca 100644 --- a/lib/errorlogger.h +++ b/lib/errorlogger.h @@ -292,7 +292,7 @@ public: /** Symbol names */ const std::string &symbolNames() const { - return _symbolNames; + return mSymbolNames; } Suppressions::ErrorMessage toSuppressionsErrorMessage() const; @@ -316,7 +316,7 @@ public: std::string mVerboseMessage; /** symbol names */ - std::string _symbolNames; + std::string mSymbolNames; }; ErrorLogger() { }