wsd/Admin.cpp | 4 ++-- wsd/ClientSession.cpp | 4 ++-- wsd/DocumentBroker.cpp | 2 +- wsd/FileServer.cpp | 15 ++++++++------- wsd/LOOLWSD.cpp | 15 +++++++-------- wsd/Storage.cpp | 6 +++--- wsd/TileCache.cpp | 6 +++--- 7 files changed, 26 insertions(+), 26 deletions(-)
New commits: commit 4ab070ec383755519423956bdaf81153fac93c53 Author: Tor Lillqvist <[email protected]> Date: Wed Nov 8 10:34:37 2017 +0200 Sort #include and using lines for consistency ... but did not have the time or energy to do it in all files. Change-Id: I92ea101cae1ad7be0fd2f31ce5a8d4b4149332c9 diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp index 19da7e4c..b11b50b4 100644 --- a/wsd/Admin.cpp +++ b/wsd/Admin.cpp @@ -25,9 +25,9 @@ #include "Common.hpp" #include "FileServer.hpp" #include "IoUtil.hpp" -#include "Protocol.hpp" #include "LOOLWSD.hpp" #include "Log.hpp" +#include "Protocol.hpp" #include "Storage.hpp" #include "TileCache.hpp" #include "Unit.hpp" @@ -40,8 +40,8 @@ using namespace LOOLProtocol; -using Poco::StringTokenizer; using Poco::Net::HTTPResponse; +using Poco::StringTokenizer; using Poco::Util::Application; /// Process incoming websocket messages diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index 630c0f38..544b8497 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -17,14 +17,14 @@ #include <Poco/StringTokenizer.h> #include <Poco/URI.h> -#include "common/Common.hpp" #include "DocumentBroker.hpp" #include "LOOLWSD.hpp" +#include "common/Common.hpp" #include "common/Log.hpp" #include "common/Protocol.hpp" #include "common/Session.hpp" -#include "common/Util.hpp" #include "common/Unit.hpp" +#include "common/Util.hpp" using namespace LOOLProtocol; diff --git a/wsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp index 77559bfc..c26c2fd5 100644 --- a/wsd/DocumentBroker.cpp +++ b/wsd/DocumentBroker.cpp @@ -18,10 +18,10 @@ #include <fstream> #include <sstream> +#include <Poco/DigestStream.h> #include <Poco/JSON/Object.h> #include <Poco/Path.h> #include <Poco/SHA1Engine.h> -#include <Poco/DigestStream.h> #include <Poco/StreamCopier.h> #include <Poco/StringTokenizer.h> diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp index 3cba4961..2fa659c2 100644 --- a/wsd/FileServer.cpp +++ b/wsd/FileServer.cpp @@ -12,9 +12,10 @@ #include <iomanip> #include <string> #include <vector> -#include <unistd.h> -#include <sys/stat.h> + #include <dirent.h> +#include <sys/stat.h> +#include <unistd.h> #include <zlib.h> #include <openssl/evp.h> @@ -24,11 +25,11 @@ #include <Poco/DateTimeFormatter.h> #include <Poco/Exception.h> #include <Poco/FileStream.h> -#include <Poco/Net/HTTPCookie.h> -#include <Poco/Net/HTTPBasicCredentials.h> -#include <Poco/Net/HTTPResponse.h> #include <Poco/Net/HTMLForm.h> +#include <Poco/Net/HTTPBasicCredentials.h> +#include <Poco/Net/HTTPCookie.h> #include <Poco/Net/HTTPRequest.h> +#include <Poco/Net/HTTPResponse.h> #include <Poco/Net/NameValueCollection.h> #include <Poco/Net/NetException.h> #include <Poco/Runnable.h> @@ -39,15 +40,15 @@ #include "Auth.hpp" #include "Common.hpp" #include "FileServer.hpp" -#include "Protocol.hpp" #include "LOOLWSD.hpp" #include "Log.hpp" +#include "Protocol.hpp" using Poco::Net::HTMLForm; +using Poco::Net::HTTPBasicCredentials; using Poco::Net::HTTPRequest; using Poco::Net::HTTPResponse; using Poco::Net::NameValueCollection; -using Poco::Net::HTTPBasicCredentials; using Poco::Util::Application; std::map<std::string, std::pair<std::string, std::string>> FileServerRequestHandler::FileHash; diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index 879d206f..83436634 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -47,13 +47,13 @@ #include <sstream> #include <thread> -#include <Poco/DateTimeFormatter.h> #include <Poco/DOM/AutoPtr.h> #include <Poco/DOM/DOMParser.h> #include <Poco/DOM/DOMWriter.h> #include <Poco/DOM/Document.h> #include <Poco/DOM/Element.h> #include <Poco/DOM/NodeList.h> +#include <Poco/DateTimeFormatter.h> #include <Poco/Environment.h> #include <Poco/Exception.h> #include <Poco/File.h> @@ -90,10 +90,15 @@ #include "ClientSession.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" +#ifdef KIT_IN_PROCESS +# include <Kit.hpp> +#endif #include "Log.hpp" #include "Protocol.hpp" #include "ServerSocket.hpp" @@ -101,18 +106,12 @@ #if ENABLE_SSL # include "SslSocket.hpp" #endif -#include "DelaySocket.hpp" #include "Storage.hpp" #include "TraceFile.hpp" #include "Unit.hpp" #include "UnitHTTP.hpp" #include "UserMessages.hpp" #include "Util.hpp" -#include "FileUtil.hpp" - -#ifdef KIT_IN_PROCESS -# include <Kit.hpp> -#endif #ifdef FUZZER # include <tools/Replay.hpp> @@ -159,8 +158,8 @@ using Poco::XML::DOMParser; using Poco::XML::DOMWriter; using Poco::XML::Element; using Poco::XML::InputSource; -using Poco::XML::NodeList; using Poco::XML::Node; +using Poco::XML::NodeList; int ClientPortNumber = DEFAULT_CLIENT_PORT_NUMBER; int MasterPortNumber = DEFAULT_MASTER_PORT_NUMBER; diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp index 1f402287..ebb1994d 100644 --- a/wsd/Storage.cpp +++ b/wsd/Storage.cpp @@ -34,19 +34,19 @@ #include <Poco/Timestamp.h> // For residual Poco SSL usage. -#include <Poco/Net/Context.h> -#include <Poco/Net/SSLManager.h> #include <Poco/Net/AcceptCertificateHandler.h> +#include <Poco/Net/Context.h> #include <Poco/Net/KeyConsoleHandler.h> +#include <Poco/Net/SSLManager.h> #include "Auth.hpp" #include "Common.hpp" #include "Exceptions.hpp" -#include "common/FileUtil.hpp" #include "LOOLWSD.hpp" #include "Log.hpp" #include "Unit.hpp" #include "Util.hpp" +#include "common/FileUtil.hpp" bool StorageBase::FilesystemEnabled; bool StorageBase::WopiEnabled; diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp index ab3070d8..5689084a 100644 --- a/wsd/TileCache.cpp +++ b/wsd/TileCache.cpp @@ -32,19 +32,19 @@ #include "ClientSession.hpp" #include "Common.hpp" -#include "common/FileUtil.hpp" #include "Protocol.hpp" #include "SenderQueue.hpp" #include "Unit.hpp" #include "Util.hpp" +#include "common/FileUtil.hpp" + +using namespace LOOLProtocol; using Poco::DirectoryIterator; using Poco::File; using Poco::StringTokenizer; using Poco::Timestamp; -using namespace LOOLProtocol; - TileCache::TileCache(const std::string& docURL, const Timestamp& modifiedTime, const std::string& cacheDir) : _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
