[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp loolwsd/Makefile.am

Miklos Vajna vmiklos at collabora.co.uk
Fri Sep 30 07:29:38 UTC 2016


 loolwsd/DocumentBroker.cpp |    4 +++-
 loolwsd/Makefile.am        |    3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 827d5ed9c825c3636d32071de2611029436e1f87
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Fri Sep 30 09:29:08 2016 +0200

    DocumentBroker: it's enough to build that temporary string once
    
    Change-Id: I253874fefdb2dfe9bb22a8b3bef641499a49dcc9

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index ba2dd04..aeafaa3 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -450,9 +450,11 @@ void DocumentBroker::alertAllUsersOfDocument(const std::string& cmd, const std::
 {
     std::lock_guard<std::mutex> lock(_mutex);
 
+    std::stringstream ss;
+    ss << "error: cmd=" << cmd << " kind=" << kind;
     for (auto& it: _sessions)
     {
-        it.second->sendTextFrame("error: cmd=" + cmd + " kind=" + kind);
+        it.second->sendTextFrame(ss.str());
     }
 }
 
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index b9c935c..fa6c3a0 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -170,6 +170,9 @@ clean-cache cache-clean:
 # Intentionally don't use "*" below... Avoid risk of accidentally running rm -rf /*
 	test -n "@LOOLWSD_CACHEDIR@" && rm -rf "@LOOLWSD_CACHEDIR@"/[0-9a-f]
 
+clang-tidy:
+	for i in *.cpp; do echo $$i; clang-tidy -header-filter=^$(PWD).* $$i || break; done
+
 # After building loolforkit, set its capabilities as required. Do it
 # already after a plain 'make' to allow for testing without
 # installing. When building for packaging, no need for this, as the


More information about the Libreoffice-commits mailing list