diff --git a/applets/kicker/plugin/recentusagemodel.h b/applets/kicker/plugin/recentusagemodel.h --- a/applets/kicker/plugin/recentusagemodel.h +++ b/applets/kicker/plugin/recentusagemodel.h @@ -49,9 +49,6 @@ bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const override; bool lessThan(const QModelIndex &left, const QModelIndex &right) const override; - private Q_SLOTS: - void connectNewFavoritesModel(); - private: QPointer m_parentModel; }; diff --git a/applets/kicker/plugin/recentusagemodel.cpp b/applets/kicker/plugin/recentusagemodel.cpp --- a/applets/kicker/plugin/recentusagemodel.cpp +++ b/applets/kicker/plugin/recentusagemodel.cpp @@ -21,7 +21,6 @@ #include "actionlist.h" #include "appsmodel.h" #include "appentry.h" -#include "kastatsfavoritesmodel.h" #include #include @@ -65,37 +64,22 @@ InvalidAppsFilterProxy::InvalidAppsFilterProxy(AbstractModel *parentModel, QAbstractItemModel *sourceModel) : QSortFilterProxyModel(parentModel) , m_parentModel(parentModel) { - connect(parentModel, &AbstractModel::favoritesModelChanged, this, &InvalidAppsFilterProxy::connectNewFavoritesModel); - connectNewFavoritesModel(); - sourceModel->setParent(this); setSourceModel(sourceModel); } InvalidAppsFilterProxy::~InvalidAppsFilterProxy() { } -void InvalidAppsFilterProxy::connectNewFavoritesModel() -{ - KAStatsFavoritesModel* favoritesModel = static_cast(m_parentModel->favoritesModel()); - connect(favoritesModel, &KAStatsFavoritesModel::favoritesChanged, this, &QSortFilterProxyModel::invalidate); - - invalidate(); -} - bool InvalidAppsFilterProxy::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const { Q_UNUSED(source_parent); const QString resource = sourceModel()->index(source_row, 0).data(ResultModel::ResourceRole).toString(); if (resource.startsWith(QLatin1String("applications:"))) { - KService::Ptr service = KService::serviceByStorageId(resource.section(QLatin1Char(':'), 1)); - - KAStatsFavoritesModel* favoritesModel = m_parentModel ? static_cast(m_parentModel->favoritesModel()) : nullptr; - - return (service && (!favoritesModel || !favoritesModel->isFavorite(service->storageId()))); + return KService::serviceByStorageId(resource.section(QLatin1Char(':'), 1)); } return true;