loolwsd/ChildProcessSession.cpp | 42 ++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 21 deletions(-)
New commits:
commit d08b1ff7e24fa8b1c9c43770b3e7ce13212137bd
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Mon Jan 11 11:17:36 2016 +0100
loolwsd: -Werror=shadow
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index ac2ed50..fdea822 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -63,7 +63,7 @@ ChildProcessSession::~ChildProcessSession()
{
Log::info("~ChildProcessSession dtor [" + getName() + "].");
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -145,7 +145,7 @@ bool ChildProcessSession::_handleInput(const char *buffer,
int length)
tokens[0] == "saveas");
{
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -233,7 +233,7 @@ bool ChildProcessSession::loadDocument(const char *
/*buffer*/, int /*length*/,
_loKitDocument = _onLoad(getId(), _jailedFilePath);
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_viewId = _loKitDocument->pClass->getView(_loKitDocument);
@@ -274,7 +274,7 @@ void ChildProcessSession::sendFontRendering(const char*
/*buffer*/, int /*length
return;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -307,7 +307,7 @@ void ChildProcessSession::sendFontRendering(const char*
/*buffer*/, int /*length
bool ChildProcessSession::getStatus(const char* buffer, int length)
{
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -339,7 +339,7 @@ bool ChildProcessSession::getCommandValues(const char*
/*buffer*/, int /*length*
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -350,7 +350,7 @@ bool ChildProcessSession::getCommandValues(const char*
/*buffer*/, int /*length*
bool ChildProcessSession::getPartPageRectangles(const char* /*buffer*/, int
/*length*/)
{
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -388,7 +388,7 @@ void ChildProcessSession::sendTile(const char* /*buffer*/,
int /*length*/, Strin
return;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -437,7 +437,7 @@ bool ChildProcessSession::clientZoom(const char*
/*buffer*/, int /*length*/, Str
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -471,7 +471,7 @@ bool ChildProcessSession::downloadAs(const char*
/*buffer*/, int /*length*/, Str
const auto tmpDir = Util::createRandomDir(JailedDocumentRoot);
const auto url = JailedDocumentRoot + tmpDir + "/" + name;
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
//TODO: Cleanup the file after downloading.
_loKitDocument->pClass->saveAs(_loKitDocument, url.c_str(),
@@ -500,7 +500,7 @@ bool ChildProcessSession::getTextSelection(const char*
/*buffer*/, int /*length*
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -524,7 +524,7 @@ bool ChildProcessSession::paste(const char* /*buffer*/, int
/*length*/, StringTo
data = Poco::cat(std::string(" "), tokens.begin() + 2,
tokens.end()).substr(strlen("data="));
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -546,7 +546,7 @@ bool ChildProcessSession::insertFile(const char*
/*buffer*/, int /*length*/, Str
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (type == "graphic")
{
@@ -587,7 +587,7 @@ bool ChildProcessSession::keyEvent(const char* /*buffer*/,
int /*length*/, Strin
if (keycode == (KEY_CTRL | KEY_W))
return true;
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -617,7 +617,7 @@ bool ChildProcessSession::mouseEvent(const char*
/*buffer*/, int /*length*/, Str
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -635,7 +635,7 @@ bool ChildProcessSession::unoCommand(const char*
/*buffer*/, int /*length*/, Str
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -672,7 +672,7 @@ bool ChildProcessSession::selectText(const char*
/*buffer*/, int /*length*/, Str
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -698,7 +698,7 @@ bool ChildProcessSession::selectGraphic(const char*
/*buffer*/, int /*length*/,
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -716,7 +716,7 @@ bool ChildProcessSession::resetSelection(const char*
/*buffer*/, int /*length*/,
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -747,7 +747,7 @@ bool ChildProcessSession::saveAs(const char* /*buffer*/,
int /*length*/, StringT
}
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
@@ -785,7 +785,7 @@ bool ChildProcessSession::setPage(const char* /*buffer*/,
int /*length*/, String
return false;
}
- std::unique_lock<std::mutex> lock(_mutex);
+ std::unique_lock<std::mutex> uniqueLock(_mutex);
if (_multiView)
_loKitDocument->pClass->setView(_loKitDocument, _viewId);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
