flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 04:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #900, filtered flag for containerOrFilteredContainer

Browse Source 
more reliable than other approaches
This commit is contained in:
Klaus Basan
2017-03-06 20:03:17 +01:00
committed by Mathew Sutcliffe
parent 6999a97f73
commit 30ef3eedf9
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/models/listmodelbase.cpp
View File

@@ -519,14 +519,16 @@ namespace BlackGui
} }
template <typename ObjectType, typename ContainerType, bool UseCompare> template <typename ObjectType, typename ContainerType, bool UseCompare>
const ContainerType &CListModelBase<ObjectType, ContainerType, UseCompare>::containerOrFilteredContainer() const const ContainerType &CListModelBase<ObjectType, ContainerType, UseCompare>::containerOrFilteredContainer(bool *filtered) const
{ {
if (this->hasFilter()) if (this->hasFilter())
{ {
if (filtered) { *filtered = true; }
return this->m_containerFiltered; return this->m_containerFiltered;
} }
else else
{ {
if (filtered) { *filtered = false; }
return this->m_container; return this->m_container;
} }
} }

2
src/blackgui/models/listmodelbase.h
View File

@@ -205,7 +205,7 @@ namespace BlackGui
const ContainerType &containerFiltered() const; const ContainerType &containerFiltered() const;
//! Full container or cached filtered container as approproiate //! Full container or cached filtered container as approproiate
const ContainerType &containerOrFilteredContainer() const; const ContainerType &containerOrFilteredContainer(bool *filtered = nullptr) const;
//! Simple set of data in container, using class is responsible for firing signals etc. //! Simple set of data in container, using class is responsible for firing signals etc.
//! \sa sendDataChanged //! \sa sendDataChanged

4
src/blackgui/views/viewbase.cpp
View File

@@ -936,10 +936,10 @@ namespace BlackGui
} }
template <class ModelClass, class ContainerType, class ObjectType> template <class ModelClass, class ContainerType, class ObjectType>
const ContainerType &CViewBase<ModelClass, ContainerType, ObjectType>::containerOrFilteredContainer() const const ContainerType &CViewBase<ModelClass, ContainerType, ObjectType>::containerOrFilteredContainer(bool *filtered) const
{ {
Q_ASSERT(this->m_model); Q_ASSERT(this->m_model);
return this->m_model->containerOrFilteredContainer(); return this->m_model->containerOrFilteredContainer(filtered);
} }
template <class ModelClass, class ContainerType, class ObjectType> template <class ModelClass, class ContainerType, class ObjectType>

2
src/blackgui/views/viewbase.h
View File

@@ -549,7 +549,7 @@ namespace BlackGui
const ContainerType &container() const; const ContainerType &container() const;
//! \copydoc BlackGui::Models::CListModelBase::containerOrFilteredContainer //! \copydoc BlackGui::Models::CListModelBase::containerOrFilteredContainer
const ContainerType &containerOrFilteredContainer() const; const ContainerType &containerOrFilteredContainer(bool *filtered = nullptr) const;
//! \name Selection model interface //! \name Selection model interface
//! @{ //! @{