[Libreoffice-commits] online.git: loolwsd/bundled loolwsd/LibreOfficeKit.hpp loolwsd/LOOLKit.cpp

[Miklos Vajna]

 loolwsd/LOOLKit.cpp                                     |    4 ++--
 loolwsd/LibreOfficeKit.hpp                              |    4 ++--
 loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 3d27e285b6a81ee515c3be1d6a996a5333dc86c2
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date:   Fri Sep 16 12:32:19 2016 +0200

    lok::Document: rename getViews() to getViewsCount()
    
    Adapt client code to the changed core.git API.
    
    Change-Id: I752d27919b7983909c8e96900115cca26bac11c6

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 6f0f4c4..e1b0a12 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -641,7 +641,7 @@ public:
         }
 
         std::unique_lock<std::mutex> lock(_loKitDocument->getLock());
-        if (_loKitDocument->getViews() <= 0)
+        if (_loKitDocument->getViewsCount() <= 0)
         {
             Log::error("Tile rendering requested without views.");
             return;
@@ -716,7 +716,7 @@ public:
         }
 
         std::unique_lock<std::mutex> lock(_loKitDocument->getLock());
-        if (_loKitDocument->getViews() <= 0)
+        if (_loKitDocument->getViewsCount() <= 0)
         {
             Log::error("Tile rendering requested without views.");
             return;
diff --git a/loolwsd/LibreOfficeKit.hpp b/loolwsd/LibreOfficeKit.hpp
index 5881c77..3abdf7f 100644
--- a/loolwsd/LibreOfficeKit.hpp
+++ b/loolwsd/LibreOfficeKit.hpp
@@ -427,9 +427,9 @@ public:
     /**
      * Get number of views of this document.
      */
-    inline int getViews()
+    inline int getViewsCount()
     {
-        return _pDoc->pClass->getViews(_pDoc);
+        return _pDoc->pClass->getViewsCount(_pDoc);
     }
 
     /**
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h 
b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
index 81d65c1..a0ed819 100644
--- a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
@@ -219,8 +219,8 @@ struct _LibreOfficeKitDocumentClass
     void (*setView) (LibreOfficeKitDocument* pThis, int nId);
     /// @see lok::Document::getView().
     int (*getView) (LibreOfficeKitDocument* pThis);
-    /// @see lok::Document::getViews().
-    int (*getViews) (LibreOfficeKitDocument* pThis);
+    /// @see lok::Document::getViewsCount().
+    int (*getViewsCount) (LibreOfficeKitDocument* pThis);
 
     /// @see lok::Document::renderFont().
     unsigned char* (*renderFont) (LibreOfficeKitDocument* pThis,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits