From e0b38fb2969f1906c7c40930daa81e7b0c5eb43f Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 13 Dec 2016 18:36:22 +0100 Subject: [PATCH] refs #832, unnecessary restriction to single entity (assert removed) --- src/blackgui/components/dbloadoverviewcomponent.cpp | 5 ++--- src/blackgui/components/dbloadoverviewcomponent.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/blackgui/components/dbloadoverviewcomponent.cpp b/src/blackgui/components/dbloadoverviewcomponent.cpp index 0e1e64ab0..76dbb7e13 100644 --- a/src/blackgui/components/dbloadoverviewcomponent.cpp +++ b/src/blackgui/components/dbloadoverviewcomponent.cpp @@ -256,11 +256,10 @@ namespace BlackGui sGui->getWebDataServices()->triggerReadOfInfoObjects(); } - void CDbLoadOverviewComponent::ps_dataLoaded(CEntityFlags::Entity singleEntity, CEntityFlags::ReadState state, int number) + void CDbLoadOverviewComponent::ps_dataLoaded(CEntityFlags::Entity entities, CEntityFlags::ReadState state, int number) { Q_UNUSED(number); - Q_ASSERT_X(CEntityFlags::isSingleEntity(singleEntity), Q_FUNC_INFO, "need single entity"); - if (!singleEntity.testFlag(CEntityFlags::InfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(singleEntity)) { return; } + if (!entities.testFlag(CEntityFlags::InfoObjectEntity) && !CEntityFlags::anySwiftDbEntity(entities)) { return; } if (state == CEntityFlags::ReadFinished || state == CEntityFlags::ReadFinishedRestricted) { this->m_reloading = false; diff --git a/src/blackgui/components/dbloadoverviewcomponent.h b/src/blackgui/components/dbloadoverviewcomponent.h index f02c880b5..11712af64 100644 --- a/src/blackgui/components/dbloadoverviewcomponent.h +++ b/src/blackgui/components/dbloadoverviewcomponent.h @@ -96,7 +96,7 @@ namespace BlackGui void ps_setValues(); //! Data have been loaded - void ps_dataLoaded(BlackMisc::Network::CEntityFlags::Entity singleEntity, BlackMisc::Network::CEntityFlags::ReadState state, int number); + void ps_dataLoaded(BlackMisc::Network::CEntityFlags::Entity entities, BlackMisc::Network::CEntityFlags::ReadState state, int number); }; } // ns } // ns