Adapt the code for the mass rename in core

This adapts the code for LOK to COK / Kit changes in core.
In addition renamed the DummyLibreOfficeKit to DummyCOKit.

Signed-off-by: Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk>
Change-Id: I42a98468db173227477a73c0779d740a9b74b04d

Author: quikee

Makefile.am

@@ -552,7 +552,7 @@ kit_headers = \
               kit/ChildSession.hpp \
               kit/Delta.hpp \
               kit/DeltaSimd.h \
-              kit/DummyLibreOfficeKit.hpp \
+              kit/DummyCOKit.hpp \
               kit/Kit.hpp \
               kit/KitHelper.hpp \
               kit/KitWebSocket.hpp \
@@ -580,13 +580,13 @@ noinst_HEADERS = \
 
 dist-hook:
 	git log -1 --format=%h --abbrev=10 > $(distdir)/dist_git_hash 2> /dev/null || rm $(distdir)/dist_git_hash
-	$(QUIET_MKDIRP) mkdir -p $(distdir)/bundled/include/LibreOfficeKit/
-	cp @LOKIT_PATH@/LibreOfficeKit/LibreOfficeKit.h \
-	   @LOKIT_PATH@/LibreOfficeKit/LibreOfficeKit.hxx \
-	   @LOKIT_PATH@/LibreOfficeKit/LibreOfficeKitEnums.h \
-	   @LOKIT_PATH@/LibreOfficeKit/LibreOfficeKitInit.h \
-	   @LOKIT_PATH@/LibreOfficeKit/LibreOfficeKitTypes.h \
-	   $(distdir)/bundled/include/LibreOfficeKit/
+	$(QUIET_MKDIRP) mkdir -p $(distdir)/bundled/include/COKit/
+	cp @LOKIT_PATH@/COKit/COKit.h \
+	   @LOKIT_PATH@/COKit/COKit.hxx \
+	   @LOKIT_PATH@/COKit/COKitEnums.h \
+	   @LOKIT_PATH@/COKit/COKitInit.h \
+	   @LOKIT_PATH@/COKit/COKitTypes.h \
+	   $(distdir)/bundled/include/COKit/
 
 EXTRA_DIST = \
              $(man_MANS) \

android/lib/src/main/cpp/androidapp.cpp

@@ -22,7 +22,7 @@
 #include <common/Util.hpp>
 
 #define LIBO_INTERNAL_ONLY
-#include <LibreOfficeKit/LibreOfficeKit.hxx>
+#include <COKit/COKit.hxx>
 
 #include <osl/detail/android-bootstrap.h>
 

common/MobileApp.hpp

@@ -23,7 +23,7 @@
 
 // On iOS at least we want to be able to have several documents open in the same app process.
 
-// It is somewhat complicated to make sure we access the same LibreOfficeKit object for the document
+// It is somewhat complicated to make sure we access the same COKit object for the document
 // in both the iOS-specific Objective-C++ code and in the mostly generic Online C++ code.
 
 // We pass around a numeric ever-increasing document identifier that gets bumped for each document
@@ -36,7 +36,7 @@
 // and opening of several documents in sequence very quickly might cause discrepancies, so it is
 // better to use a different counter to be sure. Patches to use just one counter welcome.
 
-namespace lok
+namespace kit
 {
 class Document;
 }
@@ -53,7 +53,7 @@ class DocumentData
     {
     }
 
-    lok::Document *loKitDocument;
+    kit::Document *loKitDocument;
 
     static DocumentData &allocate(unsigned docId);
     static DocumentData &get(unsigned docId);

common/Png.hpp

@@ -165,7 +165,7 @@ unpremultiply_rgba_data (png_structp /*png*/, png_row_infop row_info, png_bytep
 /// png_write_row(), so can't use const here for pixmap.
 inline bool impl_encodeSubBufferToPNG(unsigned char* pixmap, size_t startX, size_t startY,
                                       int width, int height, int bufferWidth, int bufferHeight,
-                                      std::vector<char>& output, LibreOfficeKitTileMode mode)
+                                      std::vector<char>& output, COKitTileMode mode)
 {
     if (bufferWidth < width || bufferHeight < height)
     {
@@ -203,10 +203,10 @@ inline bool impl_encodeSubBufferToPNG(unsigned char* pixmap, size_t startX, size
 
     switch (mode)
     {
-        case LOK_TILEMODE_BGRA:
+        case KIT_TILEMODE_BGRA:
             png_set_write_user_transform_fn (png_ptr, unpremultiply_bgra_data);
             break;
-        case LOK_TILEMODE_RGBA:
+        case KIT_TILEMODE_RGBA:
             png_set_write_user_transform_fn (png_ptr, unpremultiply_rgba_data);
             break;
     }
@@ -228,7 +228,7 @@ inline bool impl_encodeSubBufferToPNG(unsigned char* pixmap, size_t startX, size
 /// png_write_row(), so can't use const here for pixmap.
 inline bool encodeSubBufferToPNG(unsigned char* pixmap, size_t startX, size_t startY, int width,
                                  int height, int bufferWidth, int bufferHeight,
-                                 std::vector<char>& output, LibreOfficeKitTileMode mode)
+                                 std::vector<char>& output, COKitTileMode mode)
 {
     ProfileZone pz("encodeSubBufferToPNG");
 
@@ -267,7 +267,7 @@ inline bool encodeSubBufferToPNG(unsigned char* pixmap, size_t startX, size_t st
 
 inline
 bool encodeBufferToPNG(unsigned char* pixmap, int width, int height,
-                       std::vector<char>& output, LibreOfficeKitTileMode mode)
+                       std::vector<char>& output, COKitTileMode mode)
 {
     return encodeSubBufferToPNG(pixmap, 0, 0, width, height, width, height, output, mode);
 }

common/Protocol.cpp

@@ -23,8 +23,8 @@
 #include <string>
 #include <string_view>
 
-#define LOK_USE_UNSTABLE_API
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#define KIT_USE_UNSTABLE_API
+#include <COKit/COKitEnums.h>
 
 namespace COOLProtocol
 {

common/Protocol.hpp

@@ -23,8 +23,8 @@
 #include <string_view>
 #include <vector>
 
-#define LOK_USE_UNSTABLE_API
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#define KIT_USE_UNSTABLE_API
+#include <COKit/COKitEnums.h>
 
 namespace COOLProtocol
 {

common/RenderTiles.hpp

@@ -17,7 +17,7 @@
 #include <kit/Delta.hpp>
 #include <wsd/TileDesc.hpp>
 
-#include <LibreOfficeKit/LibreOfficeKit.hxx>
+#include <COKit/COKit.hxx>
 
 #include <cassert>
 #include <memory>
@@ -58,11 +58,11 @@ namespace RenderTiles
     }
 
     bool doRender(
-        const std::shared_ptr<lok::Document>& document, DeltaGenerator& deltaGen,
+        const std::shared_ptr<kit::Document>& document, DeltaGenerator& deltaGen,
         TileCombined& tileCombined, ThreadPool& pngPool,
         const std::function<void(unsigned char* data, int offsetX, int offsetY, size_t pixmapWidth,
                                  size_t pixmapHeight, int pixelWidth, int pixelHeight,
-                                 LibreOfficeKitTileMode mode)>& blendWatermark,
+                                 COKitTileMode mode)>& blendWatermark,
         const std::function<void(const char* buffer, size_t length)>& outputMessage,
         [[maybe_unused]] unsigned mobileAppDocId, CanonicalViewId canonicalViewId, bool dumpTiles)
     {
@@ -136,7 +136,7 @@ namespace RenderTiles
                 << renderArea.getWidth() << ", " << renderArea.getHeight() << ") "
                 << " took " << elapsedUs << " (" << area / elapsedUs.count() << " MP/s).");
 
-        const auto mode = static_cast<LibreOfficeKitTileMode>(document->getTileMode());
+        const auto mode = static_cast<COKitTileMode>(document->getTileMode());
 
         const size_t pixmapSize = 4 * pixmapWidth * pixmapHeight;
         std::vector<char> output;

common/Unit.hpp

@@ -22,7 +22,7 @@
 
 #include <test/testlog.hpp>
 
-#include <LibreOfficeKit/LibreOfficeKitInit.h>
+#include <COKit/COKitInit.h>
 
 class UnitBase;
 class UnitWSD;
@@ -703,10 +703,10 @@ class UnitKit : public UnitBase
     /// After the kit process created a ChildSession
     virtual void postKitSessionCreated(Session* /*session*/) {}
 
-    /// Allow a custom LibreOfficeKit wrapper
-    virtual LibreOfficeKit *lok_init(const char * /* instdir */,
+    /// Allow a custom COKit wrapper
+    virtual COKit *cok_init(const char * /* instdir */,
                                      const char * /* userdir */,
-                                     LokHookFunction2 /* fn */)
+                                     CokHookFunction2 /* fn */)
     {
         return nullptr;
     }

common/Util.hpp

@@ -14,8 +14,8 @@
 #include <common/StringVector.hpp>
 #include <common/Log.hpp>
 
-#define LOK_USE_UNSTABLE_API
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#define KIT_USE_UNSTABLE_API
+#include <COKit/COKitEnums.h>
 
 #include <typeinfo>
 

configure.ac

@@ -284,7 +284,7 @@ AC_ARG_ENABLE([seccomp],
                               Beware of the security consequences!]))
 AC_ARG_WITH([lokit-path],
             AS_HELP_STRING([--with-lokit-path=<path>],
-                           [Path to the "include" directory with the LibreOfficeKit headers]))
+                           [Path to the "include" directory with the COKit headers]))
 
 AC_ARG_WITH([lo-path],
             AS_HELP_STRING([--with-lo-path=<path>],
@@ -1791,9 +1791,9 @@ AS_IF([test "$ENABLE_SSL" = "true"],
       [LIBS="$LIBS -lssl -lcrypto"])
 
 AS_IF([test "$ENABLE_IOSAPP" != "true" -a "$ENABLE_WINDOWSAPP" != "true" -a "$ENABLE_ANDROIDAPP" != "true" -a "$ENABLE_MACOSAPP" != "true" -a "$host_os" != "emscripten"],
-      [AC_CHECK_HEADERS([LibreOfficeKit/LibreOfficeKit.h],
+      [AC_CHECK_HEADERS([COKit/COKit.h],
                         [],
-                        [AC_MSG_ERROR([header LibreOfficeKit/LibreOfficeKit.h not found, perhaps you want to use --with-lokit-path])])
+                        [AC_MSG_ERROR([header COKit/COKit.h not found, perhaps you want to use --with-lokit-path])])
        AC_CHECK_HEADERS([Poco/Net/WebSocket.h],
                         [],
                         [AC_MSG_ERROR([header Poco/Net/WebSocket.h not found, perhaps you want to use --with-poco-includes])])