[Libreoffice-commits] online.git: common/FileUtil.cpp common/IoUtil.cpp common/Log.cpp common/MessageQueue.cpp common/Protocol.cpp common/Session.cpp common/SigUtil.cpp common/SpookyV2.cpp common/Unit.cpp common/UnitHTTP.cpp common/Util.cpp kit/ChildSession.cpp kit/DummyLibreOfficeKit.cpp kit/ForKit.cpp kit/Kit.cpp net/clientnb.cpp net/DelaySocket.cpp net/Socket.cpp net/Ssl.cpp test/DeltaTests.cpp test/httpcrashtest.cpp test/httpwserror.cpp test/httpwstest.cpp test/integration-http-server.cpp test/test.cpp test/TileCacheTests.cpp test/TileQueueTests.cpp test/UnitAdmin.cpp test/UnitClient.cpp test/UnitFuzz.cpp test/UnitOAuth.cpp test/UnitOOB.cpp test/UnitPrefork.cpp test/UnitStorage.cpp test/UnitTileCache.cpp test/UnitTimeout.cpp test/UnitWOPI.cpp test/UnitWOPISaveAs.cpp test/WhiteBoxTests.cpp tools/Config.cpp tools/Connect.cpp tools/KitClient.cpp tools/map.cpp tools/Stress.cpp tools/Tool.cpp wsd/Admin.cpp wsd/AdminModel.cpp wsd/Auth.cpp wsd/ClientSession.cpp wsd/DocumentBroker.cpp wsd/FileServer. cpp wsd/LOOLWSD.cpp wsd/Storage.cpp wsd/TestStubs.cpp wsd/TileCache.cpp
Pranav Kant
pranavk at collabora.co.uk
Wed Dec 20 15:57:22 UTC 2017
common/FileUtil.cpp | 2 +-
common/IoUtil.cpp | 4 ++--
common/Log.cpp | 2 +-
common/MessageQueue.cpp | 6 +++---
common/Protocol.cpp | 2 +-
common/Session.cpp | 4 ++--
common/SigUtil.cpp | 4 ++--
common/SpookyV2.cpp | 2 +-
common/Unit.cpp | 4 ++--
common/UnitHTTP.cpp | 2 +-
common/Util.cpp | 2 +-
kit/ChildSession.cpp | 10 +++++-----
kit/DummyLibreOfficeKit.cpp | 2 +-
kit/ForKit.cpp | 22 +++++++++++-----------
kit/Kit.cpp | 28 ++++++++++++++--------------
net/DelaySocket.cpp | 4 ++--
net/Socket.cpp | 4 ++--
net/Ssl.cpp | 4 ++--
net/clientnb.cpp | 4 ++--
test/DeltaTests.cpp | 10 +++++-----
test/TileCacheTests.cpp | 24 ++++++++++++------------
test/TileQueueTests.cpp | 14 +++++++-------
test/UnitAdmin.cpp | 14 +++++++-------
test/UnitClient.cpp | 10 +++++-----
test/UnitFuzz.cpp | 12 ++++++------
test/UnitOAuth.cpp | 12 ++++++------
test/UnitOOB.cpp | 14 +++++++-------
test/UnitPrefork.cpp | 6 +++---
test/UnitStorage.cpp | 12 ++++++------
test/UnitTileCache.cpp | 12 ++++++------
test/UnitTimeout.cpp | 8 ++++----
test/UnitWOPI.cpp | 12 ++++++------
test/UnitWOPISaveAs.cpp | 12 ++++++------
test/WhiteBoxTests.cpp | 2 +-
test/httpcrashtest.cpp | 8 ++++----
test/httpwserror.cpp | 10 +++++-----
test/httpwstest.cpp | 16 ++++++++--------
test/integration-http-server.cpp | 8 ++++----
test/test.cpp | 4 ++--
tools/Config.cpp | 6 +++---
tools/Connect.cpp | 10 +++++-----
tools/KitClient.cpp | 8 ++++----
tools/Stress.cpp | 6 +++---
tools/Tool.cpp | 8 ++++----
tools/map.cpp | 2 +-
wsd/Admin.cpp | 20 ++++++++++----------
wsd/AdminModel.cpp | 12 ++++++------
wsd/Auth.cpp | 6 +++---
wsd/ClientSession.cpp | 14 +++++++-------
wsd/DocumentBroker.cpp | 10 +++++-----
wsd/FileServer.cpp | 8 ++++----
wsd/LOOLWSD.cpp | 30 +++++++++++++++---------------
wsd/Storage.cpp | 12 ++++++------
wsd/TestStubs.cpp | 2 +-
wsd/TileCache.cpp | 12 ++++++------
55 files changed, 249 insertions(+), 249 deletions(-)
New commits:
commit f63858433b44507c5a95a79af00dd004a09f00fa
Author: Pranav Kant <pranavk at collabora.co.uk>
Date: Wed Dec 20 18:36:26 2017 +0530
loplugin:includeform
Change-Id: Ib62a7aa61062f00698aa3e8a144438de5c57e53d
diff --git a/common/FileUtil.cpp b/common/FileUtil.cpp
index af6dfef5..afb0395e 100644
--- a/common/FileUtil.cpp
+++ b/common/FileUtil.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "FileUtil.hpp"
diff --git a/common/IoUtil.cpp b/common/IoUtil.cpp
index c93023af..58fc274e 100644
--- a/common/IoUtil.cpp
+++ b/common/IoUtil.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "IoUtil.hpp"
@@ -29,7 +29,7 @@
#include "Common.hpp"
#include "Protocol.hpp"
-#include <LOOLWebSocket.hpp>
+#include "LOOLWebSocket.hpp"
#include "Log.hpp"
#include "Util.hpp"
diff --git a/common/Log.cpp b/common/Log.cpp
index 0b19d88f..5a4f121f 100644
--- a/common/Log.cpp
+++ b/common/Log.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <sys/prctl.h>
#include <sys/syscall.h>
diff --git a/common/MessageQueue.cpp b/common/MessageQueue.cpp
index a53ae988..1f1d805f 100644
--- a/common/MessageQueue.cpp
+++ b/common/MessageQueue.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "MessageQueue.hpp"
@@ -18,8 +18,8 @@
#include <Poco/JSON/Parser.h>
#include <Poco/StringTokenizer.h>
-#include <Protocol.hpp>
-#include <Log.hpp>
+#include "Protocol.hpp"
+#include "Log.hpp"
#include <TileDesc.hpp>
using Poco::StringTokenizer;
diff --git a/common/Protocol.cpp b/common/Protocol.cpp
index b5e04665..a4c089b2 100644
--- a/common/Protocol.cpp
+++ b/common/Protocol.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "Protocol.hpp"
diff --git a/common/Session.cpp b/common/Session.cpp
index 6a3dc585..6070955c 100644
--- a/common/Session.cpp
+++ b/common/Session.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "Session.hpp"
@@ -36,7 +36,7 @@
#include "IoUtil.hpp"
#include "Protocol.hpp"
#include "Log.hpp"
-#include "TileCache.hpp"
+#include <TileCache.hpp>
#include "Util.hpp"
#include "Unit.hpp"
diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp
index 48899f37..e2e5d518 100644
--- a/common/SigUtil.cpp
+++ b/common/SigUtil.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "SigUtil.hpp"
@@ -34,7 +34,7 @@
#include <string>
#include <thread>
-#include "Socket.hpp"
+#include <Socket.hpp>
#include "Common.hpp"
#include "Log.hpp"
diff --git a/common/SpookyV2.cpp b/common/SpookyV2.cpp
index 88d79696..1fa1f36f 100644
--- a/common/SpookyV2.cpp
+++ b/common/SpookyV2.cpp
@@ -9,7 +9,7 @@
// July 30 2012: I reintroduced the buffer overflow
// August 5 2012: SpookyV2: d = should be d += in short hash, and remove extra mix from long hash
-#include "config.h"
+#include <config.h>
#include <memory.h>
#include "SpookyV2.h"
diff --git a/common/Unit.cpp b/common/Unit.cpp
index ce67207f..ac969953 100644
--- a/common/Unit.cpp
+++ b/common/Unit.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <iostream>
#include "Unit.hpp"
@@ -23,7 +23,7 @@
#include "Log.hpp"
#include "Util.hpp"
-#include "common/SigUtil.hpp"
+#include <common/SigUtil.hpp>
UnitBase *UnitBase::Global = nullptr;
diff --git a/common/UnitHTTP.cpp b/common/UnitHTTP.cpp
index b4b652b1..0d4b23c0 100644
--- a/common/UnitHTTP.cpp
+++ b/common/UnitHTTP.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <iostream>
#include "UnitHTTP.hpp"
diff --git a/common/Util.cpp b/common/Util.cpp
index 51c15b74..480354da 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "Util.hpp"
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index 530c5d98..6c7223bd 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "ChildSession.hpp"
@@ -22,11 +22,11 @@
#include <Poco/StringTokenizer.h>
#include <Poco/URI.h>
-#include "common/FileUtil.hpp"
+#include <common/FileUtil.hpp>
#include "KitHelper.hpp"
-#include "Log.hpp"
-#include "Png.hpp"
-#include "Util.hpp"
+#include <Log.hpp>
+#include <Png.hpp>
+#include <Util.hpp>
using Poco::JSON::Object;
using Poco::JSON::Parser;
diff --git a/kit/DummyLibreOfficeKit.cpp b/kit/DummyLibreOfficeKit.cpp
index 55f4e0ce..6f167089 100644
--- a/kit/DummyLibreOfficeKit.cpp
+++ b/kit/DummyLibreOfficeKit.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "DummyLibreOfficeKit.hpp"
diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp
index 32ee85e1..e399c116 100644
--- a/kit/ForKit.cpp
+++ b/kit/ForKit.cpp
@@ -11,7 +11,7 @@
* spawn lots of kits as children.
*/
-#include "config.h"
+#include <config.h>
#include <sys/capability.h>
#include <sys/stat.h>
@@ -29,17 +29,17 @@
#include <Poco/Thread.h>
#include <Poco/Util/Application.h>
-#include "Common.hpp"
-#include "IoUtil.hpp"
+#include <Common.hpp>
+#include <IoUtil.hpp>
#include "Kit.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "Util.hpp"
-
-#include "common/FileUtil.hpp"
-#include "common/Seccomp.hpp"
-#include "common/SigUtil.hpp"
-#include "security.h"
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <Util.hpp>
+
+#include <common/FileUtil.hpp>
+#include <common/Seccomp.hpp>
+#include <common/SigUtil.hpp>
+#include <security.h>
using Poco::Process;
using Poco::Thread;
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index 13e791ac..956826af 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -11,7 +11,7 @@
* a document editing session.
*/
-#include "config.h"
+#include <config.h>
#include <dlfcn.h>
#include <ftw.h>
@@ -53,23 +53,23 @@
#include <Poco/Util/Application.h>
#include "ChildSession.hpp"
-#include "Common.hpp"
-#include "IoUtil.hpp"
+#include <Common.hpp>
+#include <IoUtil.hpp>
#include "KitHelper.hpp"
#include "Kit.hpp"
-#include "Protocol.hpp"
-#include "LOOLWebSocket.hpp"
-#include "Log.hpp"
-#include "Png.hpp"
-#include "Rectangle.hpp"
-#include "TileDesc.hpp"
-#include "Unit.hpp"
-#include "UserMessages.hpp"
-#include "Util.hpp"
+#include <Protocol.hpp>
+#include <LOOLWebSocket.hpp>
+#include <Log.hpp>
+#include <Png.hpp>
+#include <Rectangle.hpp>
+#include <TileDesc.hpp>
+#include <Unit.hpp>
+#include <UserMessages.hpp>
+#include <Util.hpp>
#include "Delta.hpp"
-#include "common/SigUtil.hpp"
-#include "common/Seccomp.hpp"
+#include <common/SigUtil.hpp>
+#include <common/Seccomp.hpp>
#ifdef FUZZER
#include <kit/DummyLibreOfficeKit.hpp>
diff --git a/net/DelaySocket.cpp b/net/DelaySocket.cpp
index 20990e5c..2c999edb 100644
--- a/net/DelaySocket.cpp
+++ b/net/DelaySocket.cpp
@@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
-#include "net/DelaySocket.hpp"
+#include <net/DelaySocket.hpp>
#define DELAY_LOG(X) std::cerr << X << "\n";
diff --git a/net/Socket.cpp b/net/Socket.cpp
index 475649ac..eb2f19fb 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <stdio.h>
#include <ctype.h>
@@ -19,7 +19,7 @@
#include <Poco/DateTimeFormatter.h>
#include <Poco/Net/HTTPResponse.h>
-#include "SigUtil.hpp"
+#include <SigUtil.hpp>
#include "Socket.hpp"
#include "ServerSocket.hpp"
#include "WebSocketHandler.hpp"
diff --git a/net/Ssl.cpp b/net/Ssl.cpp
index a16caa25..5f6eaa4d 100644
--- a/net/Ssl.cpp
+++ b/net/Ssl.cpp
@@ -7,14 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <assert.h>
#include "Ssl.hpp"
#include <sys/syscall.h>
-#include "Util.hpp"
+#include <Util.hpp>
extern "C"
{
diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index a5b00483..ba13d94b 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <atomic>
#include <cerrno>
@@ -37,7 +37,7 @@
#include <Poco/Runnable.h>
#include <Poco/Thread.h>
-#include "Util.hpp"
+#include <Util.hpp>
using Poco::Net::HTTPClientSession;
using Poco::Net::HTTPRequest;
diff --git a/test/DeltaTests.cpp b/test/DeltaTests.cpp
index 66868523..f324cf9d 100644
--- a/test/DeltaTests.cpp
+++ b/test/DeltaTests.cpp
@@ -7,14 +7,14 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cppunit/extensions/HelperMacros.h>
-#include "Delta.hpp"
-#include "Util.hpp"
-#include "Png.hpp"
-#include "helpers.hpp"
+#include <Delta.hpp>
+#include <Util.hpp>
+#include <Png.hpp>
+#include <helpers.hpp>
/// Delta unit-tests.
class DeltaTests : public CPPUNIT_NS::TestFixture
diff --git a/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
index 2231dfa9..82ee85fe 100644
--- a/test/TileCacheTests.cpp
+++ b/test/TileCacheTests.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <Poco/Net/AcceptCertificateHandler.h>
#include <Poco/Net/InvalidCertificateHandler.h>
@@ -15,18 +15,18 @@
#include <cppunit/extensions/HelperMacros.h>
-#include "Common.hpp"
-#include "Protocol.hpp"
+#include <Common.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
-#include "MessageQueue.hpp"
-#include "Png.hpp"
-#include "TileCache.hpp"
-#include "Unit.hpp"
-#include "Util.hpp"
-
-#include "countloolkits.hpp"
-#include "helpers.hpp"
-#include "test.hpp"
+#include <MessageQueue.hpp>
+#include <Png.hpp>
+#include <TileCache.hpp>
+#include <Unit.hpp>
+#include <Util.hpp>
+
+#include <countloolkits.hpp>
+#include <helpers.hpp>
+#include <test.hpp>
using namespace helpers;
diff --git a/test/TileQueueTests.cpp b/test/TileQueueTests.cpp
index bcf38ba3..8c0cbd6d 100644
--- a/test/TileQueueTests.cpp
+++ b/test/TileQueueTests.cpp
@@ -7,16 +7,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cppunit/extensions/HelperMacros.h>
-#include "Common.hpp"
-#include "Protocol.hpp"
-#include "Message.hpp"
-#include "MessageQueue.hpp"
-#include "SenderQueue.hpp"
-#include "Util.hpp"
+#include <Common.hpp>
+#include <Protocol.hpp>
+#include <Message.hpp>
+#include <MessageQueue.hpp>
+#include <SenderQueue.hpp>
+#include <Util.hpp>
namespace CPPUNIT_NS
{
diff --git a/test/UnitAdmin.cpp b/test/UnitAdmin.cpp
index 4f4f877c..cbead413 100644
--- a/test/UnitAdmin.cpp
+++ b/test/UnitAdmin.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <condition_variable>
#include <mutex>
@@ -21,12 +21,12 @@
#include <Poco/StringTokenizer.h>
#include <Poco/URI.h>
-#include "Common.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "Util.hpp"
-#include "helpers.hpp"
+#include <Common.hpp>
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
+#include <Util.hpp>
+#include <helpers.hpp>
#define UNIT_URI "/loolwsd/unit-admin"
diff --git a/test/UnitClient.cpp b/test/UnitClient.cpp
index 0de67bac..e3580f90 100644
--- a/test/UnitClient.cpp
+++ b/test/UnitClient.cpp
@@ -9,12 +9,12 @@
// Runs client tests in their own thread inside a WSD process.
-#include "config.h"
+#include <config.h>
-#include "Unit.hpp"
-#include "wsd/LOOLWSD.hpp"
+#include <Unit.hpp>
+#include <wsd/LOOLWSD.hpp>
-#include "test.hpp"
+#include <test.hpp>
// Inside the WSD process
class UnitClient : public UnitWSD
@@ -71,6 +71,6 @@ UnitBase *unit_create_wsd(void)
// Allows re-use of UnitClient in test.cpp impls.
#define UNIT_CLIENT_TESTS
-#include "test.cpp"
+#include <test.cpp>
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/UnitFuzz.cpp b/test/UnitFuzz.cpp
index 68367884..075fb110 100644
--- a/test/UnitFuzz.cpp
+++ b/test/UnitFuzz.cpp
@@ -7,18 +7,18 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cassert>
#include <iostream>
#include <random>
-#include "Common.hpp"
-#include "IoUtil.hpp"
-#include "Protocol.hpp"
+#include <Common.hpp>
+#include <IoUtil.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
-#include "Unit.hpp"
-#include "Util.hpp"
+#include <Unit.hpp>
+#include <Util.hpp>
#include <Poco/Timestamp.h>
#include <Poco/StringTokenizer.h>
diff --git a/test/UnitOAuth.cpp b/test/UnitOAuth.cpp
index 5b2b09c2..fad7ad12 100644
--- a/test/UnitOAuth.cpp
+++ b/test/UnitOAuth.cpp
@@ -7,13 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
-#include "WopiTestServer.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "helpers.hpp"
+#include <WopiTestServer.hpp>
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
+#include <helpers.hpp>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/Net/OAuth20Credentials.h>
#include <Poco/Util/LayeredConfiguration.h>
diff --git a/test/UnitOOB.cpp b/test/UnitOOB.cpp
index 44e3863e..f648e423 100644
--- a/test/UnitOOB.cpp
+++ b/test/UnitOOB.cpp
@@ -12,15 +12,15 @@
* UnitFuzz.
*/
-#include "config.h"
+#include <config.h>
-#include "Common.hpp"
-#include "IoUtil.hpp"
-#include "Protocol.hpp"
+#include <Common.hpp>
+#include <IoUtil.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "Util.hpp"
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
+#include <Util.hpp>
#include <Poco/Timestamp.h>
#include <Poco/StringTokenizer.h>
diff --git a/test/UnitPrefork.cpp b/test/UnitPrefork.cpp
index 90852a69..a87c63b3 100644
--- a/test/UnitPrefork.cpp
+++ b/test/UnitPrefork.cpp
@@ -7,10 +7,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
-#include "Unit.hpp"
-#include "wsd/LOOLWSD.hpp"
+#include <Unit.hpp>
+#include <wsd/LOOLWSD.hpp>
const int NumToPrefork = 20;
diff --git a/test/UnitStorage.cpp b/test/UnitStorage.cpp
index 525a2fd2..91b08ec9 100644
--- a/test/UnitStorage.cpp
+++ b/test/UnitStorage.cpp
@@ -7,15 +7,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <iostream>
-#include "Exceptions.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "helpers.hpp"
+#include <Exceptions.hpp>
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
+#include <helpers.hpp>
using namespace helpers;
diff --git a/test/UnitTileCache.cpp b/test/UnitTileCache.cpp
index a61d297c..eba7015e 100644
--- a/test/UnitTileCache.cpp
+++ b/test/UnitTileCache.cpp
@@ -7,16 +7,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <fstream>
#include <thread>
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "Util.hpp"
-#include "helpers.hpp"
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
+#include <Util.hpp>
+#include <helpers.hpp>
using namespace helpers;
diff --git a/test/UnitTimeout.cpp b/test/UnitTimeout.cpp
index c5df8745..0097d635 100644
--- a/test/UnitTimeout.cpp
+++ b/test/UnitTimeout.cpp
@@ -7,15 +7,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cassert>
#include <Poco/Util/Application.h>
-#include "Log.hpp"
-#include "Util.hpp"
-#include "Unit.hpp"
+#include <Log.hpp>
+#include <Util.hpp>
+#include <Unit.hpp>
using Poco::Timestamp;
diff --git a/test/UnitWOPI.cpp b/test/UnitWOPI.cpp
index 338fb145..3e1542d9 100644
--- a/test/UnitWOPI.cpp
+++ b/test/UnitWOPI.cpp
@@ -7,13 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
-#include "WopiTestServer.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "helpers.hpp"
+#include <WopiTestServer.hpp>
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
+#include <helpers.hpp>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/Util/LayeredConfiguration.h>
diff --git a/test/UnitWOPISaveAs.cpp b/test/UnitWOPISaveAs.cpp
index 578ec37f..ce84d9a8 100644
--- a/test/UnitWOPISaveAs.cpp
+++ b/test/UnitWOPISaveAs.cpp
@@ -7,13 +7,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
-#include "WopiTestServer.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
-#include "helpers.hpp"
+#include <WopiTestServer.hpp>
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
+#include <helpers.hpp>
#include <Poco/Net/HTTPRequest.h>
#include <Poco/Util/LayeredConfiguration.h>
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index 5ec14b4f..6099839c 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cppunit/extensions/HelperMacros.h>
diff --git a/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
index 0f8b1c3f..9c7d5ab3 100644
--- a/test/httpcrashtest.cpp
+++ b/test/httpcrashtest.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <errno.h>
#include <signal.h>
@@ -40,9 +40,9 @@
#include <Util.hpp>
#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
-#include "helpers.hpp"
-#include "countloolkits.hpp"
-#include "test.hpp"
+#include <helpers.hpp>
+#include <countloolkits.hpp>
+#include <test.hpp>
using namespace helpers;
diff --git a/test/httpwserror.cpp b/test/httpwserror.cpp
index 7af7aa5a..ded7f032 100644
--- a/test/httpwserror.cpp
+++ b/test/httpwserror.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <vector>
#include <string>
@@ -24,11 +24,11 @@
#include <cppunit/extensions/HelperMacros.h>
-#include "Common.hpp"
-#include "Protocol.hpp"
+#include <Common.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
-#include "helpers.hpp"
-#include "countloolkits.hpp"
+#include <helpers.hpp>
+#include <countloolkits.hpp>
using namespace helpers;
diff --git a/test/httpwstest.cpp b/test/httpwstest.cpp
index dee2e160..fa711077 100644
--- a/test/httpwstest.cpp
+++ b/test/httpwstest.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <algorithm>
#include <condition_variable>
@@ -40,15 +40,15 @@
#include <cppunit/extensions/HelperMacros.h>
-#include "Common.hpp"
-#include "Protocol.hpp"
+#include <Common.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
-#include "Png.hpp"
-#include "UserMessages.hpp"
-#include "Util.hpp"
+#include <Png.hpp>
+#include <UserMessages.hpp>
+#include <Util.hpp>
-#include "countloolkits.hpp"
-#include "helpers.hpp"
+#include <countloolkits.hpp>
+#include <helpers.hpp>
using namespace helpers;
diff --git a/test/integration-http-server.cpp b/test/integration-http-server.cpp
index f93874ff..6e9ce689 100644
--- a/test/integration-http-server.cpp
+++ b/test/integration-http-server.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <Poco/Net/AcceptCertificateHandler.h>
#include <Poco/Net/FilePartSource.h>
@@ -26,11 +26,11 @@
#include <cppunit/extensions/HelperMacros.h>
#include <Common.hpp>
-#include "common/FileUtil.hpp"
+#include <common/FileUtil.hpp>
#include <Util.hpp>
-#include "countloolkits.hpp"
-#include "helpers.hpp"
+#include <countloolkits.hpp>
+#include <helpers.hpp>
/// Tests the HTTP GET API of loolwsd.
class HTTPServerTest : public CPPUNIT_NS::TestFixture
diff --git a/test/test.cpp b/test/test.cpp
index 4e540478..2225e37d 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "test.hpp"
+#include <test.hpp>
-#include "config.h"
+#include <config.h>
#include <cstdlib>
#include <iostream>
diff --git a/tools/Config.cpp b/tools/Config.cpp
index c8e7c717..e12bbf4e 100644
--- a/tools/Config.cpp
+++ b/tools/Config.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <iostream>
#include <iomanip>
@@ -24,8 +24,8 @@
#include <Poco/Util/OptionSet.h>
#include <Poco/Util/XMLConfiguration.h>
-#include "Util.hpp"
-#include "Crypto.hpp"
+#include <Util.hpp>
+#include <Crypto.hpp>
using Poco::Util::Application;
using Poco::Util::HelpFormatter;
diff --git a/tools/Connect.cpp b/tools/Connect.cpp
index 1131d330..04b55ea0 100644
--- a/tools/Connect.cpp
+++ b/tools/Connect.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cstdlib>
#include <cstring>
@@ -32,11 +32,11 @@
#include <Poco/URI.h>
#include <Poco/Util/Application.h>
-#include "Common.hpp"
-#include "Protocol.hpp"
+#include <Common.hpp>
+#include <Protocol.hpp>
#include <LOOLWebSocket.hpp>
-#include "Log.hpp"
-#include "Util.hpp"
+#include <Log.hpp>
+#include <Util.hpp>
using namespace LOOLProtocol;
diff --git a/tools/KitClient.cpp b/tools/KitClient.cpp
index 4357907c..cb3881dc 100644
--- a/tools/KitClient.cpp
+++ b/tools/KitClient.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cassert>
#include <cstdlib>
@@ -27,9 +27,9 @@
#include <Poco/URI.h>
#include <Poco/Util/Application.h>
-#include "KitHelper.hpp"
-#include "Png.hpp"
-#include "Util.hpp"
+#include <KitHelper.hpp>
+#include <Png.hpp>
+#include <Util.hpp>
using Poco::StringTokenizer;
using Poco::TemporaryFile;
diff --git a/tools/Stress.cpp b/tools/Stress.cpp
index 1acbb9f3..6cd8d3dc 100644
--- a/tools/Stress.cpp
+++ b/tools/Stress.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <unistd.h>
@@ -30,8 +30,8 @@
#include <Poco/Util/OptionSet.h>
#include "Replay.hpp"
-#include "TraceFile.hpp"
-#include "test/helpers.hpp"
+#include <TraceFile.hpp>
+#include <test/helpers.hpp>
/// Stress testing and performance/scalability benchmarking tool.
class Stress: public Poco::Util::Application
diff --git a/tools/Tool.cpp b/tools/Tool.cpp
index 545641ac..3b9db249 100644
--- a/tools/Tool.cpp
+++ b/tools/Tool.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <unistd.h>
@@ -34,9 +34,9 @@
#include <Poco/Util/Option.h>
#include <Poco/Util/OptionSet.h>
-#include "Common.hpp"
-#include "Protocol.hpp"
-#include "Util.hpp"
+#include <Common.hpp>
+#include <Protocol.hpp>
+#include <Util.hpp>
/// Simple command-line tool for file format conversion.
class Tool: public Poco::Util::Application
diff --git a/tools/map.cpp b/tools/map.cpp
index 468e986e..db627daa 100644
--- a/tools/map.cpp
+++ b/tools/map.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <vector>
#include <iostream>
diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index b11b50b4..c3c121e7 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <cassert>
#include <mutex>
@@ -22,21 +22,21 @@
#include "Admin.hpp"
#include "AdminModel.hpp"
#include "Auth.hpp"
-#include "Common.hpp"
+#include <Common.hpp>
#include "FileServer.hpp"
-#include "IoUtil.hpp"
+#include <IoUtil.hpp>
#include "LOOLWSD.hpp"
-#include "Log.hpp"
-#include "Protocol.hpp"
+#include <Log.hpp>
+#include <Protocol.hpp>
#include "Storage.hpp"
#include "TileCache.hpp"
-#include "Unit.hpp"
-#include "Util.hpp"
+#include <Unit.hpp>
+#include <Util.hpp>
-#include "net/Socket.hpp"
-#include "net/WebSocketHandler.hpp"
+#include <net/Socket.hpp>
+#include <net/WebSocketHandler.hpp>
-#include "common/SigUtil.hpp"
+#include <common/SigUtil.hpp>
using namespace LOOLProtocol;
diff --git a/wsd/AdminModel.cpp b/wsd/AdminModel.cpp
index b3d67f7a..ea0a0589 100644
--- a/wsd/AdminModel.cpp
+++ b/wsd/AdminModel.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "AdminModel.hpp"
@@ -20,11 +20,11 @@
#include <Poco/StringTokenizer.h>
#include <Poco/URI.h>
-#include "Protocol.hpp"
-#include "net/WebSocketHandler.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "Util.hpp"
+#include <Protocol.hpp>
+#include <net/WebSocketHandler.hpp>
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <Util.hpp>
void Document::addView(const std::string& sessionId, const std::string& userName, const std::string& userId)
{
diff --git a/wsd/Auth.cpp b/wsd/Auth.cpp
index 088719d7..8b1a0ec7 100644
--- a/wsd/Auth.cpp
+++ b/wsd/Auth.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "Auth.hpp"
@@ -30,8 +30,8 @@
#include <Poco/Timestamp.h>
#include <Poco/URI.h>
-#include "Log.hpp"
-#include "Util.hpp"
+#include <Log.hpp>
+#include <Util.hpp>
using Poco::Base64Decoder;
using Poco::Base64Encoder;
diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp
index 2bba11cf..5b0881bf 100644
--- a/wsd/ClientSession.cpp
+++ b/wsd/ClientSession.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "ClientSession.hpp"
@@ -19,12 +19,12 @@
#include "DocumentBroker.hpp"
#include "LOOLWSD.hpp"
-#include "common/Common.hpp"
-#include "common/Log.hpp"
-#include "common/Protocol.hpp"
-#include "common/Session.hpp"
-#include "common/Unit.hpp"
-#include "common/Util.hpp"
+#include <common/Common.hpp>
+#include <common/Log.hpp>
+#include <common/Protocol.hpp>
+#include <common/Session.hpp>
+#include <common/Unit.hpp>
+#include <common/Util.hpp>
using namespace LOOLProtocol;
diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
index fad24344..e74c22f5 100644
--- a/wsd/DocumentBroker.cpp
+++ b/wsd/DocumentBroker.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "DocumentBroker.hpp"
@@ -33,10 +33,10 @@
#include "SenderQueue.hpp"
#include "Storage.hpp"
#include "TileCache.hpp"
-#include "common/Log.hpp"
-#include "common/Message.hpp"
-#include "common/Protocol.hpp"
-#include "common/Unit.hpp"
+#include <common/Log.hpp>
+#include <common/Message.hpp>
+#include <common/Protocol.hpp>
+#include <common/Unit.hpp>
using namespace LOOLProtocol;
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 501966ba..73308421 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include <iomanip>
#include <string>
@@ -38,11 +38,11 @@
#include <Poco/URI.h>
#include "Auth.hpp"
-#include "Common.hpp"
+#include <Common.hpp>
#include "FileServer.hpp"
#include "LOOLWSD.hpp"
-#include "Log.hpp"
-#include "Protocol.hpp"
+#include <Log.hpp>
+#include <Protocol.hpp>
using Poco::Net::HTMLForm;
using Poco::Net::HTTPBasicCredentials;
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 622396f7..760d74ad 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "LOOLWSD.hpp"
@@ -91,36 +91,36 @@
#include "Admin.hpp"
#include "Auth.hpp"
#include "ClientSession.hpp"
-#include "Common.hpp"
-#include "Crypto.hpp"
-#include "DelaySocket.hpp"
+#include <Common.hpp>
+#include <Crypto.hpp>
+#include <DelaySocket.hpp>
#include "DocumentBroker.hpp"
#include "Exceptions.hpp"
#include "FileServer.hpp"
-#include "FileUtil.hpp"
-#include "IoUtil.hpp"
+#include <FileUtil.hpp>
+#include <IoUtil.hpp>
#ifdef KIT_IN_PROCESS
# include <Kit.hpp>
#endif
-#include "Log.hpp"
-#include "Protocol.hpp"
-#include "ServerSocket.hpp"
-#include "Session.hpp"
+#include <Log.hpp>
+#include <Protocol.hpp>
+#include <ServerSocket.hpp>
+#include <Session.hpp>
#if ENABLE_SSL
-# include "SslSocket.hpp"
+# include <SslSocket.hpp>
#endif
#include "Storage.hpp"
#include "TraceFile.hpp"
-#include "Unit.hpp"
-#include "UnitHTTP.hpp"
+#include <Unit.hpp>
+#include <UnitHTTP.hpp>
#include "UserMessages.hpp"
-#include "Util.hpp"
+#include <Util.hpp>
#ifdef FUZZER
# include <tools/Replay.hpp>
#endif
-#include "common/SigUtil.hpp"
+#include <common/SigUtil.hpp>
using namespace LOOLProtocol;
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index 1ebd28e0..7985b42e 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "Storage.hpp"
@@ -40,13 +40,13 @@
#include <Poco/Net/SSLManager.h>
#include "Auth.hpp"
-#include "Common.hpp"
+#include <Common.hpp>
#include "Exceptions.hpp"
#include "LOOLWSD.hpp"
-#include "Log.hpp"
-#include "Unit.hpp"
-#include "Util.hpp"
-#include "common/FileUtil.hpp"
+#include <Log.hpp>
+#include <Unit.hpp>
+#include <Util.hpp>
+#include <common/FileUtil.hpp>
bool StorageBase::FilesystemEnabled;
bool StorageBase::WopiEnabled;
diff --git a/wsd/TestStubs.cpp b/wsd/TestStubs.cpp
index b9ff5a58..434d8e2c 100644
--- a/wsd/TestStubs.cpp
+++ b/wsd/TestStubs.cpp
@@ -11,7 +11,7 @@
* Stub missing symbols required for unit tests ...
*/
-#include "config.h"
+#include <config.h>
#include "DocumentBroker.hpp"
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 5689084a..e92bb380 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "config.h"
+#include <config.h>
#include "TileCache.hpp"
@@ -31,12 +31,12 @@
#include <Poco/URI.h>
#include "ClientSession.hpp"
-#include "Common.hpp"
-#include "Protocol.hpp"
+#include <Common.hpp>
+#include <Protocol.hpp>
#include "SenderQueue.hpp"
-#include "Unit.hpp"
-#include "Util.hpp"
-#include "common/FileUtil.hpp"
+#include <Unit.hpp>
+#include <Util.hpp>
+#include <common/FileUtil.hpp>
using namespace LOOLProtocol;
More information about the Libreoffice-commits
mailing list