From 141baf6f6a0242f3e21f37f8a8b3aea21d25448e Mon Sep 17 00:00:00 2001
From: Andras Timar <andras.timar@collabora.com>
Date: Fri, 13 Dec 2019 16:03:26 +0100
Subject: fix error: declaration of ‘load’ shadows a member of 'this'
 [-Werror=shadow]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I4bd4fb3ae6f01c0d03d622f90e1dfb872c396494
---
 wsd/DocumentBroker.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index 77204dd69..fecea32bc 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -2244,8 +2244,8 @@ bool ConvertToBroker::startConversion(SocketDisposition &disposition, const std:
                      // Load the document manually and request saving in the target format.
                      std::string encodedFrom;
                      Poco::URI::encode(docBroker->getPublicUri().getPath(), "", encodedFrom);
-                     const std::string load = "load url=" + encodedFrom;
-                     std::vector<char> loadRequest(load.begin(), load.end());
+                     const std::string _load = "load url=" + encodedFrom;
+                     std::vector<char> loadRequest(_load.begin(), _load.end());
                      docBroker->_clientSession->handleMessage(true, WSOpCode::Text, loadRequest);
 
                      // Save is done in the setLoaded
-- 
cgit v1.2.3