From 12db652ccf449dbfaff65f77c43184d019f95efd Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 15 Aug 2017 02:13:31 +0200
Subject: [PATCH] Ref T125, renaming areAllDataRead => areAllInfoObjectsRead

---
 src/blackcore/db/infodatareader.cpp | 2 +-
 src/blackcore/db/infodatareader.h   | 2 +-
 src/blackcore/webdataservices.cpp   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/blackcore/db/infodatareader.cpp b/src/blackcore/db/infodatareader.cpp
index e0bdc4bfd..6d6917fd4 100644
--- a/src/blackcore/db/infodatareader.cpp
+++ b/src/blackcore/db/infodatareader.cpp
@@ -44,7 +44,7 @@ namespace BlackCore
             return m_infoObjects.size();
         }
 
-        bool CInfoDataReader::areAllDataRead() const
+        bool CInfoDataReader::areAllInfoObjectsRead() const
         {
             return getInfoObjectCount() > 4;
         }
diff --git a/src/blackcore/db/infodatareader.h b/src/blackcore/db/infodatareader.h
index 7c83ccc31..c086ee06a 100644
--- a/src/blackcore/db/infodatareader.h
+++ b/src/blackcore/db/infodatareader.h
@@ -45,7 +45,7 @@ namespace BlackCore
 
             //! All data read?
             //! \threadsafe
-            bool areAllDataRead() const;
+            bool areAllInfoObjectsRead() const;
 
             //! Allow to call directly, special for info objects reader
             void read();
diff --git a/src/blackcore/webdataservices.cpp b/src/blackcore/webdataservices.cpp
index 3dadfe481..6ca44cef5 100644
--- a/src/blackcore/webdataservices.cpp
+++ b/src/blackcore/webdataservices.cpp
@@ -1124,7 +1124,7 @@ namespace BlackCore
         {
             // with info objects wait until info objects are loaded
             Q_ASSERT_X(!entities.testFlag(CEntityFlags::DbInfoObjectEntity), Q_FUNC_INFO, "Info object must be read upfront, do not pass as entity here");
-            const bool waitForDbInfoReader = m_dbInfoDataReader && !m_dbInfoDataReader->areAllDataRead() && !m_dbInfoDataReader->isMarkedAsFailed();
+            const bool waitForDbInfoReader = m_dbInfoDataReader && !m_dbInfoDataReader->areAllInfoObjectsRead() && !m_dbInfoDataReader->isMarkedAsFailed();
             if (waitForDbInfoReader)
             {
                 // do not read yet, will call this function again after some time
@@ -1182,7 +1182,7 @@ namespace BlackCore
         }
         else if (reader->hasReceivedFirstReply())
         {
-            if (reader->areAllDataRead())
+            if (reader->areAllInfoObjectsRead())
             {
                 // we have all data and carry on
                 CLogMessage(this).info("Info objects (%1) for '%2' loaded from '%3'") << info << CEntityFlags::flagToString(entities) << reader->getInfoObjectsUrl().toQString();