diff --git a/libnotificationmanager/notifications.cpp b/libnotificationmanager/notifications.cpp --- a/libnotificationmanager/notifications.cpp +++ b/libnotificationmanager/notifications.cpp @@ -20,11 +20,11 @@ #include "notifications.h" +#include #include #include #include -#include #include #include "notificationsmodel.h" @@ -81,7 +81,7 @@ JobsModel::Ptr jobsModel; QSharedPointer settings() const; - KConcatenateRowsProxyModel *notificationsAndJobsModel = nullptr; + QConcatenateTablesProxyModel *notificationsAndJobsModel = nullptr; NotificationFilterProxyModel *filterModel = nullptr; NotificationSortProxyModel *sortModel = nullptr; @@ -141,7 +141,7 @@ * NotificationsModel JobsModel * \\ / * \\ / - * KConcatenateRowsProxyModel + * QConcatenateTablesProxyModel * ||| * ||| * NotificationFilterProxyModel @@ -174,7 +174,7 @@ */ if (!notificationsAndJobsModel) { - notificationsAndJobsModel = new KConcatenateRowsProxyModel(q); + notificationsAndJobsModel = new QConcatenateTablesProxyModel(q); } if (!filterModel) { @@ -358,8 +358,8 @@ found = true; break; } - } else if (auto *concatenateModel = qobject_cast(model)) { - // There's no "sourceModels()" on KConcatenateRowsProxyModel + } else if (auto *concatenateModel = qobject_cast(model)) { + // TODO use QConcatenateTablesProxyModel::sourceModels() once we depend on Qt 5.15 if (idxModel == notificationsModel.data() || idxModel == jobsModel.data()) { resolvedIdx = concatenateModel->mapFromSource(resolvedIdx); found = true; diff --git a/libnotificationmanager/utils.cpp b/libnotificationmanager/utils.cpp --- a/libnotificationmanager/utils.cpp +++ b/libnotificationmanager/utils.cpp @@ -23,13 +23,12 @@ #include #include #include +#include #include #include #include #include -#include - #include using namespace NotificationManager; @@ -79,8 +78,8 @@ while (resolvedIdx.isValid() && resolvedIdx.model() != sourceModel) { if (auto *proxyModel = qobject_cast(resolvedIdx.model())) { resolvedIdx = proxyModel->mapToSource(resolvedIdx); - // KConcatenateRowsProxyModel isn't a "real" proxy model, so we need to special case for it :( - } else if (auto *concatenateModel = qobject_cast(resolvedIdx.model())) { + // QConcatenateTablesProxyModel isn't a "real" proxy model, so we need to special case for it :( + } else if (auto *concatenateModel = qobject_cast(resolvedIdx.model())) { resolvedIdx = concatenateModel->mapToSource(resolvedIdx); } else { if (resolvedIdx.model() != sourceModel) {