[Libreoffice-commits] online.git: loolwsd/DocumentBroker.cpp loolwsd/Storage.cpp loolwsd/Storage.hpp

[Miklos Vajna]

 loolwsd/DocumentBroker.cpp |    4 ++--
 loolwsd/Storage.cpp        |    6 +++---
 loolwsd/Storage.hpp        |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 17de53981e25828813cb0268c2f2f4a03d439b5e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Apr 19 09:10:07 2016 +0200

    Storage: fix missing underscore for non-static members
    
    Change-Id: Ibde55358c9640344e8bb4e6e24b287b1e7d8c6b5

diff --git a/loolwsd/DocumentBroker.cpp b/loolwsd/DocumentBroker.cpp
index 75f3440..10776b3 100644
--- a/loolwsd/DocumentBroker.cpp
+++ b/loolwsd/DocumentBroker.cpp
@@ -130,8 +130,8 @@ bool DocumentBroker::load(const std::string& jailId)
     if (storage)
     {
         const auto fileInfo = storage->getFileInfo(_uriPublic);
-        _tileCache.reset(new TileCache(_uriPublic.toString(), fileInfo.ModifiedTime, _cacheRoot));
-        _filename = fileInfo.Filename;
+        _tileCache.reset(new TileCache(_uriPublic.toString(), fileInfo._modifiedTime, _cacheRoot));
+        _filename = fileInfo._filename;
         _storage = StorageBase::create(jailRoot, jailPath.toString(), _uriPublic);
 
         const auto localPath = _storage->loadStorageFileToLocal();
diff --git a/loolwsd/Storage.cpp b/loolwsd/Storage.cpp
index 309748d..41c8830 100644
--- a/loolwsd/Storage.cpp
+++ b/loolwsd/Storage.cpp
@@ -253,7 +253,7 @@ std::string WopiStorage::loadStorageFileToLocal()
     Log::info("Downloading URI [" + _uri + "].");
 
     _fileInfo = getFileInfo(Poco::URI(_uri));
-    if (_fileInfo.Size == 0 && _fileInfo.Filename.empty())
+    if (_fileInfo._size == 0 && _fileInfo._filename.empty())
     {
         //TODO: Should throw a more appropriate exception.
         throw std::runtime_error("Failed to load file from storage.");
@@ -286,7 +286,7 @@ std::string WopiStorage::loadStorageFileToLocal()
 
     logger << Log::end;
 
-    _jailedFilePath = Poco::Path(getLocalRootPath(), _fileInfo.Filename).toString();
+    _jailedFilePath = Poco::Path(getLocalRootPath(), _fileInfo._filename).toString();
     std::ofstream ofs(_jailedFilePath);
     std::copy(std::istreambuf_iterator<char>(rs),
               std::istreambuf_iterator<char>(),
@@ -298,7 +298,7 @@ std::string WopiStorage::loadStorageFileToLocal()
                 << response.getStatus() << " " << response.getReason() << Log::end;
 
     // Now return the jailed path.
-    return Poco::Path(_jailPath, _fileInfo.Filename).toString();
+    return Poco::Path(_jailPath, _fileInfo._filename).toString();
 }
 
 bool WopiStorage::saveLocalFileToStorage()
diff --git a/loolwsd/Storage.hpp b/loolwsd/Storage.hpp
index 564663c..84aa8a2 100644
--- a/loolwsd/Storage.hpp
+++ b/loolwsd/Storage.hpp
@@ -30,12 +30,12 @@ public:
     public:
         bool isValid() const
         {
-            return !Filename.empty() && Size > 0;
+            return !_filename.empty() && _size > 0;
         }
 
-        std::string Filename;
-        Poco::Timestamp ModifiedTime;
-        size_t Size;
+        std::string _filename;
+        Poco::Timestamp _modifiedTime;
+        size_t _size;
     };
 
     /// localStorePath the absolute root path of the chroot.