loolwsd/LOKitClient.cpp | 4 ++--
loolwsd/LOOLKit.cpp | 11 +++++++++++
loolwsd/LOOLWSD.cpp | 4 ++--
loolwsd/LoadTest.cpp | 2 +-
4 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit eb308ef9cf1c6238675608ec39f1df4bd953afd5
Author: Michael Meeks <michael.me...@collabora.com>
Date: Mon Aug 17 16:50:42 2015 +0100
Add missing headers & fix whitespace.
diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 97d42da..e4e6bc5 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -117,7 +117,7 @@ protected:
if (tokens[0] == "?" || tokens[0] == "help")
{
- std::cout <<
+ std::cout <<
"Commands mimic LOOL protocol but we talk directly to
LOKit:" << std::endl <<
" status" << std::endl <<
" calls LibreOfficeKitDocument::getDocumentType,
getParts, getPartName, getDocumentSize" << std::endl <<
@@ -152,7 +152,7 @@ protected:
int tilePosY(std::stoi(tokens[5]));
int tileWidth(std::stoi(tokens[6]));
int tileHeight(std::stoi(tokens[7]));
-
+
std::vector<unsigned char> pixmap(canvasWidth*canvasHeight*4);
loKitDocument->pClass->setPart(loKitDocument, partNumber);
loKitDocument->pClass->paintTile(loKitDocument, pixmap.data(),
canvasWidth, canvasHeight, tilePosX, tilePosY, tileWidth, tileHeight);
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 818fdeb..9394e43 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -1,3 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
#include <sys/prctl.h>
#include <memory>
@@ -210,3 +219,5 @@ int main(int argc, char** argv)
std::cout << Util::logPrefix() << "loolkit finished OK!" << std::endl;
return 0;
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 30dd22d..71f4055 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -585,9 +585,9 @@ int LOOLWSD::createBroker()
args.push_back("--numprespawns=" + std::to_string(_numPreSpawnedChildren));
std::string executable =
Path(Application::instance().commandPath()).parent().toString() + "loolbroker";
-
+
Application::instance().logger().information(Util::logPrefix() +
"Launching broker: " + executable + " " + Poco::cat(std::string(" "),
args.begin(), args.end()));
-
+
ProcessHandle child = Process::launch(executable, args);
MasterProcessSession::_childProcesses[child.id()] = child.id();
diff --git a/loolwsd/LoadTest.cpp b/loolwsd/LoadTest.cpp
index b146ed2..928506f 100644
--- a/loolwsd/LoadTest.cpp
+++ b/loolwsd/LoadTest.cpp
@@ -303,7 +303,7 @@ std::vector<std::string> LoadTest::getDocList() const
return _docList;
}
-void LoadTest::defineOptions(OptionSet& options)
+void LoadTest::defineOptions(OptionSet& options)
{
Application::defineOptions(options);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
