[Libreoffice-commits] online.git: common/SenderQueue.cpp common/SenderQueue.hpp Makefile.am test/Makefile.am wsd/SenderQueue.cpp wsd/SenderQueue.hpp wsd/TileCache.cpp

[Ashod Nakashian]

 Makefile.am            |    4 -
 common/SenderQueue.cpp |   49 --------------------
 common/SenderQueue.hpp |  116 -------------------------------------------------
 test/Makefile.am       |    2 
 wsd/SenderQueue.cpp    |   49 ++++++++++++++++++++
 wsd/SenderQueue.hpp    |  116 +++++++++++++++++++++++++++++++++++++++++++++++++
 wsd/TileCache.cpp      |    2 
 7 files changed, 169 insertions(+), 169 deletions(-)

New commits:
commit 0b42af6d8dc77cb1ef44f36e20e63484461cd4b9
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sun Dec 11 12:03:38 2016 -0500

    loolwsd: move SenderQueue to wsd
    
    Change-Id: I33af4d1b2bbf0305cbc5fa6f05266d126f1bb803
    Reviewed-on: https://gerrit.libreoffice.org/31884
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/Makefile.am b/Makefile.am
index de5feb6..b04da13 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,6 @@ shared_sources = common/FileUtil.cpp \
                  common/Protocol.cpp \
                  common/Session.cpp \
                  common/MessageQueue.cpp \
-                 common/SenderQueue.cpp \
                  common/SigUtil.cpp \
                  common/SpookyV2.cpp \
                  common/Unit.cpp \
@@ -54,6 +53,7 @@ loolwsd_SOURCES = wsd/Admin.cpp \
                   wsd/ClientSession.cpp \
                   wsd/FileServer.cpp \
                   wsd/PrisonerSession.cpp \
+                  wsd/SenderQueue.cpp \
                   wsd/Storage.cpp \
                   wsd/TileCache.cpp \
                   $(shared_sources)
@@ -103,6 +103,7 @@ wsd_headers = wsd/Admin.hpp \
               wsd/LOOLWSD.hpp \
               wsd/PrisonerSession.hpp \
               wsd/QueueHandler.hpp \
+              wsd/SenderQueue.hpp \
               wsd/Storage.hpp \
               wsd/TileCache.hpp \
               wsd/TileDesc.hpp \
@@ -121,7 +122,6 @@ shared_headers = common/Common.hpp \
                  common/MessageQueue.hpp \
                  common/Png.hpp \
                  common/Rectangle.hpp \
-                 common/SenderQueue.hpp \
                  common/SigUtil.hpp \
                  common/security.h \
                  common/SpookyV2.h
diff --git a/test/Makefile.am b/test/Makefile.am
index e00e172..9a6d715 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -36,8 +36,8 @@ wsd_sources = \
             ../common/Protocol.cpp \
             ../common/Session.cpp \
             ../common/MessageQueue.cpp \
-            ../common/SenderQueue.cpp \
             ../kit/Kit.cpp \
+            ../wsd/SenderQueue.cpp \
             ../wsd/TileCache.cpp \
             ../common/Unit.cpp \
             ../common/Util.cpp
diff --git a/common/SenderQueue.cpp b/wsd/SenderQueue.cpp
similarity index 100%
rename from common/SenderQueue.cpp
rename to wsd/SenderQueue.cpp
diff --git a/common/SenderQueue.hpp b/wsd/SenderQueue.hpp
similarity index 100%
rename from common/SenderQueue.hpp
rename to wsd/SenderQueue.hpp
diff --git a/wsd/TileCache.cpp b/wsd/TileCache.cpp
index 5137073..beb754c 100644
--- a/wsd/TileCache.cpp
+++ b/wsd/TileCache.cpp
@@ -33,8 +33,8 @@
 #include "ClientSession.hpp"
 #include "Common.hpp"
 #include "common/FileUtil.hpp"
-#include "common/SenderQueue.hpp"
 #include "Protocol.hpp"
+#include "SenderQueue.hpp"
 #include "Unit.hpp"
 #include "Util.hpp"