From 6116797727f1eae91276ed8607b8cd2d6618b252 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 6 Dec 2018 03:17:50 +0100 Subject: [PATCH] Ref T442, getColumns from view/model --- src/blackgui/models/listmodelbase.h | 3 +++ src/blackgui/views/viewbase.h | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/blackgui/models/listmodelbase.h b/src/blackgui/models/listmodelbase.h index 1f8a1fd28..650f09407 100644 --- a/src/blackgui/models/listmodelbase.h +++ b/src/blackgui/models/listmodelbase.h @@ -130,6 +130,9 @@ namespace BlackGui //! Convert to JSON string virtual QString toJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Indented, bool selectedOnly = false) const = 0; + //! The columns + const CColumns &getColumns() const { return m_columns; } + signals: //! Asynchronous update finished void asyncUpdateFinished(); diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h index 214fc9b73..21d7a904e 100644 --- a/src/blackgui/views/viewbase.h +++ b/src/blackgui/views/viewbase.h @@ -49,7 +49,6 @@ class QModelIndex; class QPaintEvent; class QPoint; class QShowEvent; -class QWidget; class QTabWidget; namespace BlackMisc { class CWorker; } @@ -64,6 +63,11 @@ namespace BlackGui class CFontMenu; } + namespace Models + { + class CColumns; + } + namespace Filters { class CFilterDialog; @@ -604,6 +608,9 @@ namespace BlackGui //! Model const ModelClass *derivedModel() const { return m_model; } + //! The columns + const Models::CColumns &getColumns() const { return this->derivedModel()->getColumns(); } + //! Update whole container //! \return int size after update int updateContainer(const ContainerType &container, bool sort = true, bool resize = true);