loolwsd/ChildProcessSession.cpp | 43 ----------------------------------------
loolwsd/LOOLSession.cpp | 4 +--
loolwsd/LOOLWSD.cpp | 3 --
3 files changed, 2 insertions(+), 48 deletions(-)
New commits:
commit a44c6924e86d92987ea8efea9d470bee5b4c208e
Author: Henry Castro <hcas...@collabora.com>
Date: Thu Jul 23 16:49:45 2015 -0400
loolwsd: clean code.
diff --git a/loolwsd/ChildProcessSession.cpp b/loolwsd/ChildProcessSession.cpp
index 1b841f9..842b984 100644
--- a/loolwsd/ChildProcessSession.cpp
+++ b/loolwsd/ChildProcessSession.cpp
@@ -24,10 +24,6 @@
#include <mutex>
#include <set>
-/*#define LOK_USE_UNSTABLE_API
-#include <LibreOfficeKit/LibreOfficeKit.h>
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>*/
-
#include <Poco/Net/WebSocket.h>
#include <Poco/StringTokenizer.h>
#include <Poco/URI.h>
@@ -44,45 +40,6 @@ using Poco::StringTokenizer;
using Poco::URI;
using Poco::Path;
-/*
-
-#include <Poco/Exception.h>
-#include <Poco/File.h>
-#include <Poco/Net/HTTPStreamFactory.h>
-#include <Poco/Process.h>
-#include <Poco/Random.h>
-#include <Poco/StreamCopier.h>
-#include <Poco/String.h>
-#include <Poco/ThreadLocal.h>
-#include <Poco/URIStreamOpener.h>
-#include <Poco/Exception.h>
-#include <Poco/Net/NetException.h>
-#include <Poco/Net/DialogSocket.h>
-#include <Poco/Net/SocketAddress.h>
-
-#include "LOOLSession.hpp"
-#include "LOOLWSD.hpp"
-#include "TileCache.hpp"
-
-
-using Poco::File;
-using Poco::IOException;
-using Poco::Net::HTTPStreamFactory;
-using Poco::Process;
-using Poco::ProcessHandle;
-using Poco::Random;
-using Poco::StreamCopier;
-using Poco::Thread;
-using Poco::ThreadLocal;
-using Poco::UInt64;
-using Poco::URIStreamOpener;
-using Poco::Util::Application;
-using Poco::Exception;
-using Poco::Net::DialogSocket;
-using Poco::Net::SocketAddress;
-using Poco::Net::WebSocketException;*/
-
-
ChildProcessSession::ChildProcessSession(std::shared_ptr<WebSocket> ws,
LibreOfficeKit *loKit) :
LOOLSession(ws, Kind::ToMaster),
_loKitDocument(NULL),
diff --git a/loolwsd/LOOLSession.cpp b/loolwsd/LOOLSession.cpp
index b0a7a05..4b7342a 100644
--- a/loolwsd/LOOLSession.cpp
+++ b/loolwsd/LOOLSession.cpp
@@ -36,7 +36,7 @@ LOOLSession::LOOLSession(std::shared_ptr<WebSocket> ws, Kind
kind) :
_ws(ws),
_docURL("")
{
- //std::cout << Util::logPrefix() << "LOOLSession ctor this=" << this << "
" << _kind << " ws=" << _ws.get() << std::endl;
+ std::cout << Util::logPrefix() << "LOOLSession ctor this=" << this << " "
<< _kind << " ws=" << _ws.get() << std::endl;
if (kind == Kind::ToClient) {
_kindString = "ToClient";
}
@@ -50,7 +50,7 @@ LOOLSession::LOOLSession(std::shared_ptr<WebSocket> ws, Kind
kind) :
LOOLSession::~LOOLSession()
{
- //std::cout << Util::logPrefix() << "LOOLSession dtor this=" << this << "
" << _kind << std::endl;
+ std::cout << Util::logPrefix() << "LOOLSession dtor this=" << this << " "
<< _kind << std::endl;
Util::shutdownWebSocket(*_ws);
}
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index ee36e0b..ed9f6cc 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -560,9 +560,6 @@ int LOOLWSD::createBroker()
{
Process::Args args;
- //args.push_back("--child=" + std::to_string(_childId));
- //args.push_back("--port=" + std::to_string(LOOLWSD::portNumber));
- //args.push_back("--jail=" + LOOLWSD::jail);
args.push_back("--losubpath=" + LOOLWSD::loSubPath);
args.push_back("--systemplate=" + sysTemplate);
args.push_back("--lotemplate=" + loTemplate);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
