common/SigUtil.cpp | 13 ------------- kit/ForKit.cpp | 1 - tools/Connect.cpp | 8 -------- tools/KitClient.cpp | 1 - tools/Stress.cpp | 13 ------------- tools/Tool.cpp | 10 ---------- wsd/ClientSession.cpp | 13 +++---------- wsd/DocumentBroker.hpp | 7 ++++--- wsd/FileServer.cpp | 2 ++ wsd/LOOLWSD.cpp | 1 + wsd/LOOLWSD.hpp | 6 +----- wsd/PrisonerSession.cpp | 4 +--- 12 files changed, 12 insertions(+), 67 deletions(-)
New commits: commit ba9ffb47753cc1323fc9ebce2c4d403b4fdd9800 Author: Ashod Nakashian <[email protected]> Date: Wed Dec 21 15:37:22 2016 -0500 wsd: include cleanup Change-Id: Id481cfbab6be12a095918bdc7318fb3584345307 Reviewed-on: https://gerrit.libreoffice.org/32548 Reviewed-by: Ashod Nakashian <[email protected]> Tested-by: Ashod Nakashian <[email protected]> diff --git a/common/SigUtil.cpp b/common/SigUtil.cpp index 476fe09..bf7292c 100644 --- a/common/SigUtil.cpp +++ b/common/SigUtil.cpp @@ -29,23 +29,10 @@ #include <iomanip> #include <iostream> #include <mutex> -#include <random> #include <sstream> #include <string> #include <thread> -#include <Poco/Base64Encoder.h> -#include <Poco/ConsoleChannel.h> -#include <Poco/Exception.h> -#include <Poco/Format.h> -#include <Poco/Net/WebSocket.h> -#include <Poco/Process.h> -#include <Poco/RandomStream.h> -#include <Poco/TemporaryFile.h> -#include <Poco/Thread.h> -#include <Poco/Timestamp.h> -#include <Poco/Util/Application.h> - #include "Common.hpp" #include "Log.hpp" #include "Util.hpp" diff --git a/kit/ForKit.cpp b/kit/ForKit.cpp index 7b04e09..115a2df 100644 --- a/kit/ForKit.cpp +++ b/kit/ForKit.cpp @@ -23,7 +23,6 @@ #include <cstring> #include <iostream> #include <map> -#include <set> #include <Poco/Path.h> #include <Poco/Process.h> diff --git a/tools/Connect.cpp b/tools/Connect.cpp index ab848bc..1131d33 100644 --- a/tools/Connect.cpp +++ b/tools/Connect.cpp @@ -24,21 +24,13 @@ #include <Poco/Net/HTTPSClientSession.h> #include <Poco/Net/InvalidCertificateHandler.h> #include <Poco/Net/NetException.h> -#include <Poco/Net/PrivateKeyPassphraseHandler.h> #include <Poco/Net/SSLManager.h> -#include <Poco/Net/SocketStream.h> -#include <Poco/Net/StreamSocket.h> -#include <Poco/Net/TCPServer.h> -#include <Poco/Net/TCPServerConnection.h> -#include <Poco/Net/TCPServerConnectionFactory.h> -#include <Poco/Process.h> #include <Poco/SharedPtr.h> #include <Poco/StringTokenizer.h> #include <Poco/TemporaryFile.h> #include <Poco/Thread.h> #include <Poco/URI.h> #include <Poco/Util/Application.h> -#include <Poco/Version.h> #include "Common.hpp" #include "Protocol.hpp" diff --git a/tools/KitClient.cpp b/tools/KitClient.cpp index a587a28..9264a54 100644 --- a/tools/KitClient.cpp +++ b/tools/KitClient.cpp @@ -20,7 +20,6 @@ #include <Poco/Buffer.h> #include <Poco/Process.h> -#include <Poco/Random.h> #include <Poco/String.h> #include <Poco/StringTokenizer.h> #include <Poco/TemporaryFile.h> diff --git a/tools/Stress.cpp b/tools/Stress.cpp index 15c2a21..fac3fd0 100644 --- a/tools/Stress.cpp +++ b/tools/Stress.cpp @@ -15,30 +15,17 @@ #include <cstring> #include <fstream> #include <iostream> -#include <random> #include <thread> -#include <Poco/Net/NetException.h> #include <Poco/Net/HTTPRequest.h> #include <Poco/Net/HTTPResponse.h> -#include <Poco/Net/KeyConsoleHandler.h> -#include <Poco/Net/AcceptCertificateHandler.h> -#include <Poco/StreamCopier.h> -#include <Poco/URI.h> -#include <Poco/Process.h> -#include <Poco/StringTokenizer.h> #include <Poco/Thread.h> -#include <Poco/Timespan.h> -#include <Poco/Timestamp.h> #include <Poco/URI.h> #include <Poco/Util/Application.h> #include <Poco/Util/HelpFormatter.h> #include <Poco/Util/Option.h> #include <Poco/Util/OptionSet.h> -#include <Poco/Util/Application.h> -#include <Poco/Util/OptionSet.h> - #include "TraceFile.hpp" #include "test/helpers.hpp" diff --git a/tools/Tool.cpp b/tools/Tool.cpp index dc54975..aeda094 100644 --- a/tools/Tool.cpp +++ b/tools/Tool.cpp @@ -14,10 +14,8 @@ #include <cstring> #include <fstream> #include <iostream> -#include <random> #include <Poco/Net/HTMLForm.h> -#include <Poco/Net/NetException.h> #include <Poco/Net/HTTPClientSession.h> #include <Poco/Net/HTTPSClientSession.h> #include <Poco/Net/HTTPRequest.h> @@ -27,12 +25,7 @@ #include <Poco/Net/KeyConsoleHandler.h> #include <Poco/Net/AcceptCertificateHandler.h> #include <Poco/StreamCopier.h> -#include <Poco/URI.h> -#include <Poco/Process.h> -#include <Poco/StringTokenizer.h> #include <Poco/Thread.h> -#include <Poco/Timespan.h> -#include <Poco/Timestamp.h> #include <Poco/URI.h> #include <Poco/Util/Application.h> #include <Poco/Util/HelpFormatter.h> @@ -43,9 +36,6 @@ #include "Protocol.hpp" #include "Util.hpp" -#include <Poco/Util/Application.h> -#include <Poco/Util/OptionSet.h> - /// Simple command-line tool for file format conversion. class Tool: public Poco::Util::Application { diff --git a/wsd/ClientSession.cpp b/wsd/ClientSession.cpp index 16348db..faa0ba4 100644 --- a/wsd/ClientSession.cpp +++ b/wsd/ClientSession.cpp @@ -12,22 +12,15 @@ #include <fstream> -#include <Poco/FileStream.h> -#include <Poco/JSON/Object.h> -#include <Poco/JSON/Parser.h> #include <Poco/URI.h> -#include <Poco/URIStreamOpener.h> #include "Common.hpp" -#include "IoUtil.hpp" -#include "Protocol.hpp" -#include "Session.hpp" +#include "DocumentBroker.hpp" #include "LOOLWSD.hpp" #include "Log.hpp" #include "PrisonerSession.hpp" -#include "Rectangle.hpp" -#include "Storage.hpp" -#include "TileCache.hpp" +#include "Protocol.hpp" +#include "Session.hpp" #include "Util.hpp" using namespace LOOLProtocol; diff --git a/wsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp index f2e7604..9d227f1 100644 --- a/wsd/DocumentBroker.hpp +++ b/wsd/DocumentBroker.hpp @@ -25,15 +25,16 @@ #include "IoUtil.hpp" #include "Log.hpp" -#include <LOOLWebSocket.hpp> -#include "Storage.hpp" -#include "TileCache.hpp" +#include "LOOLWebSocket.hpp" +#include "TileDesc.hpp" #include "Util.hpp" #include "common/SigUtil.hpp" // Forwards. class DocumentBroker; +class StorageBase; +class TileCache; /// Represents a new LOK child that is read /// to host a document. diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp index 67656f3..c91fdf1 100644 --- a/wsd/FileServer.cpp +++ b/wsd/FileServer.cpp @@ -35,9 +35,11 @@ #include <Poco/Util/ServerApplication.h> #include <Poco/Util/Timer.h> +#include "Auth.hpp" #include "Common.hpp" #include "FileServer.hpp" #include "LOOLWSD.hpp" +#include "Log.hpp" using Poco::FileInputStream; using Poco::Net::HTMLForm; diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp index dc1549c..607372f 100644 --- a/wsd/LOOLWSD.cpp +++ b/wsd/LOOLWSD.cpp @@ -100,6 +100,7 @@ #include "Auth.hpp" #include "ClientSession.hpp" #include "Common.hpp" +#include "DocumentBroker.hpp" #include "Exceptions.hpp" #include "FileServer.hpp" #include "common/FileUtil.hpp" diff --git a/wsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp index f3e2aa3..0f7ecd3 100644 --- a/wsd/LOOLWSD.hpp +++ b/wsd/LOOLWSD.hpp @@ -11,18 +11,14 @@ #define INCLUDED_LOOLWSD_HPP #include <atomic> -#include <mutex> +#include <map> #include <string> #include <Poco/Path.h> #include <Poco/Process.h> -#include <Poco/Random.h> #include <Poco/Util/OptionSet.h> #include <Poco/Util/ServerApplication.h> -#include "Auth.hpp" -#include "Common.hpp" -#include "DocumentBroker.hpp" #include "Util.hpp" class TraceFileWriter; diff --git a/wsd/PrisonerSession.cpp b/wsd/PrisonerSession.cpp index b6cdb24..77971cf 100644 --- a/wsd/PrisonerSession.cpp +++ b/wsd/PrisonerSession.cpp @@ -10,13 +10,11 @@ #include "PrisonerSession.hpp" #include "config.h" -#include <Poco/FileStream.h> #include <Poco/JSON/Object.h> #include <Poco/JSON/Parser.h> -#include <Poco/URI.h> -#include <Poco/URIStreamOpener.h> #include "Common.hpp" +#include "DocumentBroker.hpp" #include "Protocol.hpp" #include "Session.hpp" #include "LOOLWSD.hpp" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
