[Libreoffice-commits] online.git: loolwsd/AdminModel.cpp loolwsd/LOOLKit.cpp
Miklos Vajna
vmiklos at collabora.co.uk
Mon Nov 7 07:27:47 UTC 2016
loolwsd/AdminModel.cpp | 2 --
loolwsd/LOOLKit.cpp | 13 ++++++++-----
2 files changed, 8 insertions(+), 7 deletions(-)
New commits:
commit 121a47120386d03b250c3668ffeb93fff94b2388
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Nov 7 08:27:19 2016 +0100
loolwsd: clean up unused using declarations
Change-Id: Ib7fc0d2dbc10cbccacde327b29fe70f255d58a05
diff --git a/loolwsd/AdminModel.cpp b/loolwsd/AdminModel.cpp
index 24c9384..5142df0 100644
--- a/loolwsd/AdminModel.cpp
+++ b/loolwsd/AdminModel.cpp
@@ -25,8 +25,6 @@
#include "Unit.hpp"
#include "Util.hpp"
-using Poco::StringTokenizer;
-
void Document::addView(const std::string& sessionId)
{
const auto ret = _views.emplace(sessionId, View(sessionId));
diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 50b6196..c97f247 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -74,13 +74,8 @@ using Poco::File;
using Poco::JSON::Array;
using Poco::JSON::Object;
using Poco::JSON::Parser;
-using Poco::Net::HTTPClientSession;
-using Poco::Net::HTTPRequest;
-using Poco::Net::HTTPResponse;
using Poco::Net::Socket;
using Poco::Net::WebSocket;
-using Poco::Path;
-using Poco::Process;
using Poco::Runnable;
using Poco::StringTokenizer;
using Poco::Thread;
@@ -88,6 +83,14 @@ using Poco::Timestamp;
using Poco::URI;
using Poco::Util::Application;
+#ifndef BUILDING_TESTS
+using Poco::Net::HTTPClientSession;
+using Poco::Net::HTTPRequest;
+using Poco::Net::HTTPResponse;
+using Poco::Path;
+using Poco::Process;
+#endif
+
using namespace LOOLProtocol;
// We only host a single document in our lifetime.
More information about the Libreoffice-commits
mailing list