summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2019-04-01 21:01:54 +0200
committerDavid Tardon <dtardon@redhat.com>2019-04-01 21:01:54 +0200
commit2f2c36d6e70248c008803b000e7e0c0e675c1bea (patch)
tree5f6d8c5eb16b78d09d1473e21640a9a7fc9c096a
parentd1fc2fbdd4b2f567770dc39457123ab74eafb09e (diff)
WaE: declaration of ‘string’ shadows a global declaration
Change-Id: I461eab7676c13cd589b167d0c16e0e1e84ee6dfa
-rw-r--r--src/lib/IWAParser.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/IWAParser.cpp b/src/lib/IWAParser.cpp
index 29c9189..1e22b2d 100644
--- a/src/lib/IWAParser.cpp
+++ b/src/lib/IWAParser.cpp
@@ -2225,10 +2225,10 @@ void IWAParser::parseAuthorInComment(unsigned id)
return;
if (get(msg).string(1))
{
- auto string=get(get(msg).string(1));
- auto len=string.size();
+ auto str=get(get(msg).string(1));
+ auto len=str.size();
if (len==0) return;
- IWAText text(string+"\t", m_langManager);
+ IWAText text(str+"\t", m_langManager);
std::map<unsigned, IWORKStylePtr_t> spans;
IWORKPropertyMap props;
// normally yellow, but blue may be better in LO