[Libreoffice-commits] online.git: Branch 'private/Ashod/nonblocking' - common/UnitHTTP.cpp net/clientnb.cpp test/UnitTimeout.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Fri Feb 17 06:47:52 UTC 2017


 common/UnitHTTP.cpp  |    2 +-
 net/clientnb.cpp     |   24 ++++++++++++------------
 test/UnitTimeout.cpp |    2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit e416c929c5a25e0c88842f8331f26d173be2c355
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Thu Feb 16 22:04:45 2017 -0500

    wsd: no tabs
    
    Change-Id: I0537f7437328cb758e691d8e0ddc12d78da11f6a
    Reviewed-on: https://gerrit.libreoffice.org/34353
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/common/UnitHTTP.cpp b/common/UnitHTTP.cpp
index 29f5e40..8e0c53e 100644
--- a/common/UnitHTTP.cpp
+++ b/common/UnitHTTP.cpp
@@ -20,7 +20,7 @@ Poco::Net::HTTPClientSession *UnitHTTP::createSession()
 UnitWebSocket::UnitWebSocket(const std::string &docURL)
 {
     try {
-	    UnitHTTPServerResponse response;
+        UnitHTTPServerResponse response;
         UnitHTTPServerRequest request(response, docURL);
 
         _session = UnitHTTP::createSession();
diff --git a/net/clientnb.cpp b/net/clientnb.cpp
index de6576c..2ab1980 100644
--- a/net/clientnb.cpp
+++ b/net/clientnb.cpp
@@ -123,20 +123,20 @@ struct Session
 struct ThreadWorker : public Runnable
 {
     const char *_domain;
-		ThreadWorker (const char *domain = NULL)
-            : _domain(domain)
+    ThreadWorker(const char *domain = nullptr)
+        : _domain(domain)
+    {
+    }
+    virtual void run()
+    {
+        for (int i = 0; i < 100; ++i)
         {
+            Session ping(_domain ? _domain : "init");
+            ping.sendPing(i);
+            int back = ping.getResponse();
+            assert(back == i + 1);
         }
-		virtual void run()
-        {
-            for (int i = 0; i < 100; ++i)
-            {
-                Session ping(_domain ? _domain : "init");
-                ping.sendPing(i);
-                int back = ping.getResponse();
-                assert(back == i + 1);
-            }
-		}
+    }
 };
 
 struct Client : public Poco::Util::Application
diff --git a/test/UnitTimeout.cpp b/test/UnitTimeout.cpp
index a5478b5..4b65d43 100644
--- a/test/UnitTimeout.cpp
+++ b/test/UnitTimeout.cpp
@@ -31,7 +31,7 @@ public:
         _timedOut = true;
         UnitBase::timeout();
     }
-	virtual void returnValue(int & retValue) override
+    virtual void returnValue(int & retValue) override
     {
         if (!_timedOut)
         {


More information about the Libreoffice-commits mailing list