[Libreoffice-commits] online.git: loolwsd/PrisonerSession.cpp

[Miklos Vajna]

 loolwsd/PrisonerSession.cpp |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d8b8a9b58be068a364d9bce9bfe46cbbec3bcb6b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon May 23 09:09:11 2016 +0200

    PrisonerSession: fix -Werror,-Wshadow
    
    Change-Id: I9ea5533708941080620cdb18751d82904c6e660a

diff --git a/loolwsd/PrisonerSession.cpp b/loolwsd/PrisonerSession.cpp
index 9dd096d..2a2fb8a 100644
--- a/loolwsd/PrisonerSession.cpp
+++ b/loolwsd/PrisonerSession.cpp
@@ -207,12 +207,12 @@ bool PrisonerSession::_handleInput(const char *buffer, int length)
         else if (tokens[0] == "invalidatecursor:")
         {
             assert(firstLine.size() == static_cast<std::string::size_type>(length));
-            StringTokenizer tokens(firstLine, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
+            StringTokenizer firstLineTokens(firstLine, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM);
             int x = 0;
             int y = 0;
-            if (tokens.count() > 2 &&
-                stringToInteger(tokens[1], x) &&
-                stringToInteger(tokens[2], y))
+            if (firstLineTokens.count() > 2 &&
+                stringToInteger(firstLineTokens[1], x) &&
+                stringToInteger(firstLineTokens[2], y))
             {
                 _docBroker->invalidateCursor(x, y);
             }