Changeset View
Changeset View
Standalone View
Standalone View
kmymoney/models/equitiesmodel.h
Show All 19 Lines | |||||
20 | 20 | | |||
21 | #include "kmm_models_export.h" | 21 | #include "kmm_models_export.h" | ||
22 | 22 | | |||
23 | // ---------------------------------------------------------------------------- | 23 | // ---------------------------------------------------------------------------- | ||
24 | // QT Includes | 24 | // QT Includes | ||
25 | 25 | | |||
26 | #include <QStandardItemModel> | 26 | #include <QStandardItemModel> | ||
27 | 27 | | |||
28 | #include <QSortFilterProxyModel> | ||||
29 | #if QT_VERSION < QT_VERSION_CHECK(5,10,0) | ||||
30 | #include <KItemModels/KRecursiveFilterProxyModel> | ||||
31 | #define QSortFilterProxyModel KRecursiveFilterProxyModel | ||||
32 | #endif | ||||
tbaumgart: The same applies here. I don't repeat all the above comments. | |||||
28 | // ---------------------------------------------------------------------------- | 33 | // ---------------------------------------------------------------------------- | ||
29 | // KDE Includes | 34 | // KDE Includes | ||
30 | 35 | | |||
31 | #include <KItemModels/KRecursiveFilterProxyModel> | | |||
32 | | ||||
33 | // ---------------------------------------------------------------------------- | 36 | // ---------------------------------------------------------------------------- | ||
34 | // Project Includes | 37 | // Project Includes | ||
35 | 38 | | |||
36 | class MyMoneyObject; | 39 | class MyMoneyObject; | ||
37 | class MyMoneyAccount; | 40 | class MyMoneyAccount; | ||
38 | 41 | | |||
39 | namespace eMyMoney { namespace File { enum class Object; } } | 42 | namespace eMyMoney { namespace File { enum class Object; } } | ||
40 | 43 | | |||
Show All 25 Lines | 63 | private: | |||
66 | void init(); | 69 | void init(); | ||
67 | void load(); | 70 | void load(); | ||
68 | 71 | | |||
69 | protected: | 72 | protected: | ||
70 | class Private; | 73 | class Private; | ||
71 | Private* const d; | 74 | Private* const d; | ||
72 | }; | 75 | }; | ||
73 | 76 | | |||
74 | class KMM_MODELS_EXPORT EquitiesFilterProxyModel : public KRecursiveFilterProxyModel | 77 | class KMM_MODELS_EXPORT EquitiesFilterProxyModel : public QSortFilterProxyModel | ||
75 | { | 78 | { | ||
76 | Q_OBJECT | 79 | Q_OBJECT | ||
77 | 80 | | |||
78 | public: | 81 | public: | ||
79 | EquitiesFilterProxyModel(QObject *parent , EquitiesModel *model, const QList<EquitiesModel::Column> &columns = QList<EquitiesModel::Column>()); | 82 | EquitiesFilterProxyModel(QObject *parent , EquitiesModel *model, const QList<EquitiesModel::Column> &columns = QList<EquitiesModel::Column>()); | ||
80 | ~EquitiesFilterProxyModel(); | 83 | ~EquitiesFilterProxyModel(); | ||
81 | 84 | | |||
82 | QList<EquitiesModel::Column> &getVisibleColumns(); | 85 | QList<EquitiesModel::Column> &getVisibleColumns(); | ||
83 | void setHideClosedAccounts(const bool hideClosedAccounts); | 86 | void setHideClosedAccounts(const bool hideClosedAccounts); | ||
84 | void setHideZeroBalanceAccounts(const bool hideZeroBalanceAccounts); | 87 | void setHideZeroBalanceAccounts(const bool hideZeroBalanceAccounts); | ||
85 | 88 | | |||
86 | Q_SIGNALS: | 89 | Q_SIGNALS: | ||
87 | void columnToggled(const EquitiesModel::Column column, const bool show); | 90 | void columnToggled(const EquitiesModel::Column column, const bool show); | ||
88 | 91 | | |||
89 | public Q_SLOTS: | 92 | public Q_SLOTS: | ||
90 | void slotColumnsMenu(const QPoint); | 93 | void slotColumnsMenu(const QPoint); | ||
91 | 94 | | |||
92 | protected: | 95 | protected: | ||
93 | bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override; | 96 | bool filterAcceptsColumn(int source_column, const QModelIndex &source_parent) const override; | ||
94 | bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; | 97 | bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; | ||
95 | 98 | | |||
96 | private: | 99 | private: | ||
97 | class Private; | 100 | class Private; | ||
98 | Private* const d; | 101 | Private* const d; | ||
102 | #if QT_VERSION < QT_VERSION_CHECK(5,10,0) | ||||
103 | // provide the interface for backward compatbility | ||||
104 | void setRecursiveFilteringEnabled(bool enable) {} | ||||
105 | #endif | ||||
tbaumgart: Remove this call. | |||||
106 | | ||||
99 | }; | 107 | }; | ||
100 | 108 | | |||
109 | #undef QSortFilterProxyModel | ||||
101 | #endif // EQUITIESMODEL_H | 110 | #endif // EQUITIESMODEL_H |
The same applies here. I don't repeat all the above comments.