[Libreoffice-commits] online.git: common/Log.cpp common/Log.hpp kit/Kit.cpp test/helpers.hpp wsd/TileCache.cpp wsd/TileCache.hpp
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Aug 13 07:26:35 UTC 2018
common/Log.cpp | 2 +-
common/Log.hpp | 2 +-
kit/Kit.cpp | 2 +-
test/helpers.hpp | 2 +-
wsd/TileCache.cpp | 2 +-
wsd/TileCache.hpp | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 9ed7c1065cfbeecf338b266030586048d24cb4d0
Author: Miklos Vajna <vmiklos at collabora.co.uk>
AuthorDate: Mon Aug 13 09:26:09 2018 +0200
Commit: Miklos Vajna <vmiklos at collabora.co.uk>
CommitDate: Mon Aug 13 09:26:15 2018 +0200
common, kit, test, wsd: these parameters are copied for each invocation ...
... but passing by const ref is enough
diff --git a/common/Log.cpp b/common/Log.cpp
index a3140bd48..6f398a3eb 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -131,7 +131,7 @@ namespace Log
const std::string& logLevel,
const bool withColor,
const bool logToFile,
- std::map<std::string, std::string> config)
+ const std::map<std::string, std::string>& config)
{
Source.name = name;
std::ostringstream oss;
diff --git a/common/Log.hpp b/common/Log.hpp
index 1a4f69cdd..0ae6a2a7e 100644
--- a/common/Log.hpp
+++ b/common/Log.hpp
@@ -38,7 +38,7 @@ namespace Log
const std::string& logLevel,
const bool withColor,
const bool logToFile,
- std::map<std::string, std::string> config);
+ const std::map<std::string, std::string>& config);
Poco::Logger& logger();
char* prefix(char* buffer, const char* level, bool sigSafe);
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 5a2148afa..07befa2b6 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -190,7 +190,7 @@ namespace
}
}
- void linkOrCopyFile(const char *fpath, Path newPath)
+ void linkOrCopyFile(const char *fpath, const Path& newPath)
{
if (linkOrCopyVerboseLogging)
LOG_INF("Linking file \"" << fpath << "\" to \"" << newPath.toString() << "\"");
diff --git a/test/helpers.hpp b/test/helpers.hpp
index 366ee9ff1..54c37a8ce 100644
--- a/test/helpers.hpp
+++ b/test/helpers.hpp
@@ -318,7 +318,7 @@ std::string getResponseString(T& ws, const std::string& prefix, const std::strin
}
template <typename T>
-std::string assertResponseString(T& ws, const std::string& prefix, const std::string testname)
+std::string assertResponseString(T& ws, const std::string& prefix, const std::string& testname)
{
const auto res = getResponseString(ws, prefix, testname);
CPPUNIT_ASSERT_EQUAL(prefix, res.substr(0, prefix.length()));
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 139d325d2..c7743a5cc 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -120,7 +120,7 @@ std::shared_ptr<TileCache::TileBeingRendered> TileCache::findTileBeingRendered(c
return tile != _tilesBeingRendered.end() ? tile->second : nullptr;
}
-void TileCache::forgetTileBeingRendered(std::shared_ptr<TileCache::TileBeingRendered> tileBeingRendered, const TileDesc& tile)
+void TileCache::forgetTileBeingRendered(const std::shared_ptr<TileCache::TileBeingRendered>& tileBeingRendered, const TileDesc& tile)
{
assertCorrectThread();
assert(tileBeingRendered);
diff --git a/wsd/TileCache.hpp b/wsd/TileCache.hpp
index e4573b465..dbee88304 100644
--- a/wsd/TileCache.hpp
+++ b/wsd/TileCache.hpp
@@ -79,7 +79,7 @@ public:
/// Store the timestamp to modtime.txt.
void saveLastModified(const Poco::Timestamp& timestamp);
- void forgetTileBeingRendered(std::shared_ptr<TileCache::TileBeingRendered> tileBeingRendered, const TileDesc& tile);
+ void forgetTileBeingRendered(const std::shared_ptr<TileCache::TileBeingRendered>& tileBeingRendered, const TileDesc& tile);
double getTileBeingRenderedElapsedTimeMs(const std::string& tileCacheName) const;
void setThreadOwner(const std::thread::id &id) { _owner = id; }
More information about the Libreoffice-commits
mailing list