diff --git a/kmymoney/models/accountsproxymodel.h b/kmymoney/models/accountsproxymodel.h --- a/kmymoney/models/accountsproxymodel.h +++ b/kmymoney/models/accountsproxymodel.h @@ -24,11 +24,16 @@ // ---------------------------------------------------------------------------- // QT Includes +#include // for QT_VERSION macro +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) +#include +#else +#include +#endif + // ---------------------------------------------------------------------------- // KDE Includes -#include - // ---------------------------------------------------------------------------- // Project Includes @@ -58,7 +63,12 @@ namespace eAccountsModel { enum class Column; } class AccountsProxyModelPrivate; -class KMM_MODELS_EXPORT AccountsProxyModel : public KRecursiveFilterProxyModel +class KMM_MODELS_EXPORT AccountsProxyModel : +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + public QSortFilterProxyModel +#else + public KRecursiveFilterProxyModel +#endif { Q_OBJECT Q_DISABLE_COPY(AccountsProxyModel) diff --git a/kmymoney/models/accountsproxymodel.cpp b/kmymoney/models/accountsproxymodel.cpp --- a/kmymoney/models/accountsproxymodel.cpp +++ b/kmymoney/models/accountsproxymodel.cpp @@ -37,17 +37,32 @@ using namespace eAccountsModel; AccountsProxyModel::AccountsProxyModel(QObject *parent) : +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + QSortFilterProxyModel(parent), +#else KRecursiveFilterProxyModel(parent), +#endif d_ptr(new AccountsProxyModelPrivate) { +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + setRecursiveFilteringEnabled(true); +#endif setDynamicSortFilter(true); setSortLocaleAware(true); setFilterCaseSensitivity(Qt::CaseInsensitive); } AccountsProxyModel::AccountsProxyModel(AccountsProxyModelPrivate &dd, QObject *parent) : - KRecursiveFilterProxyModel(parent), d_ptr(&dd) +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + QSortFilterProxyModel(parent), +#else + KRecursiveFilterProxyModel(parent), +#endif + d_ptr(&dd) { +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + setRecursiveFilteringEnabled(true); +#endif } AccountsProxyModel::~AccountsProxyModel() diff --git a/kmymoney/models/equitiesmodel.h b/kmymoney/models/equitiesmodel.h --- a/kmymoney/models/equitiesmodel.h +++ b/kmymoney/models/equitiesmodel.h @@ -25,11 +25,14 @@ #include +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) +#include +#else +#include +#endif // ---------------------------------------------------------------------------- // KDE Includes -#include - // ---------------------------------------------------------------------------- // Project Includes @@ -71,7 +74,12 @@ Private* const d; }; -class KMM_MODELS_EXPORT EquitiesFilterProxyModel : public KRecursiveFilterProxyModel +class KMM_MODELS_EXPORT EquitiesFilterProxyModel : +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + public QSortFilterProxyModel +#else + public KRecursiveFilterProxyModel +#endif { Q_OBJECT diff --git a/kmymoney/models/equitiesmodel.cpp b/kmymoney/models/equitiesmodel.cpp --- a/kmymoney/models/equitiesmodel.cpp +++ b/kmymoney/models/equitiesmodel.cpp @@ -385,8 +385,17 @@ }; EquitiesFilterProxyModel::EquitiesFilterProxyModel(QObject *parent, EquitiesModel *model, const QList &columns) - : KRecursiveFilterProxyModel(parent), d(new Private) + : +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + QSortFilterProxyModel(parent), +#else + KRecursiveFilterProxyModel(parent), +#endif + d(new Private) { +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + setRecursiveFilteringEnabled(true); +#endif setDynamicSortFilter(true); setFilterKeyColumn(-1); setSortLocaleAware(true); diff --git a/kmymoney/models/securitiesmodel.h b/kmymoney/models/securitiesmodel.h --- a/kmymoney/models/securitiesmodel.h +++ b/kmymoney/models/securitiesmodel.h @@ -24,12 +24,15 @@ // QT Includes #include +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) +#include +#else +#include +#endif // ---------------------------------------------------------------------------- // KDE Includes -#include - // ---------------------------------------------------------------------------- // Project Includes @@ -68,7 +71,12 @@ Private* const d; }; -class KMM_MODELS_EXPORT SecuritiesFilterProxyModel : public KRecursiveFilterProxyModel +class KMM_MODELS_EXPORT SecuritiesFilterProxyModel : +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + public QSortFilterProxyModel +#else + public KRecursiveFilterProxyModel +#endif { Q_OBJECT diff --git a/kmymoney/models/securitiesmodel.cpp b/kmymoney/models/securitiesmodel.cpp --- a/kmymoney/models/securitiesmodel.cpp +++ b/kmymoney/models/securitiesmodel.cpp @@ -303,8 +303,17 @@ }; SecuritiesFilterProxyModel::SecuritiesFilterProxyModel(QObject *parent, SecuritiesModel *model, const QList &columns) - : KRecursiveFilterProxyModel(parent), d(new Private) + : +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + QSortFilterProxyModel(parent), +#else + KRecursiveFilterProxyModel(parent), +#endif + d(new Private) { +#if QT_VERSION >= QT_VERSION_CHECK(5,10,0) + setRecursiveFilteringEnabled(true); +#endif setDynamicSortFilter(true); setFilterKeyColumn(-1); setSortLocaleAware(true);