[applet/systemtray] Port to QConcatenateTablesProxyModel

KConcatenateRowsProxyModel is deprecated, use
QConcatenateTablesProxyModel instead.
wilder-5.22
Konrad Materka 5 years ago
parent 951587ffae
commit e645266b77
  1. 6
      applets/systemtray/systemtraymodel.cpp
  2. 4
      applets/systemtray/systemtraymodel.h

@ -466,9 +466,9 @@ int StatusNotifierModel::indexOfSource(const QString &source) const
}
SystemTrayModel::SystemTrayModel(QObject *parent)
: KConcatenateRowsProxyModel(parent)
: QConcatenateTablesProxyModel(parent)
{
m_roleNames = KConcatenateRowsProxyModel::roleNames();
m_roleNames = QConcatenateTablesProxyModel::roleNames();
}
QHash<int, QByteArray> SystemTrayModel::roleNames() const
@ -487,5 +487,5 @@ void SystemTrayModel::addSourceModel(QAbstractItemModel *sourceModel)
}
}
KConcatenateRowsProxyModel::addSourceModel(sourceModel);
QConcatenateTablesProxyModel::addSourceModel(sourceModel);
}

@ -21,10 +21,10 @@
#define SYSTEMTRAYMODEL_H
#include <QAbstractListModel>
#include <QConcatenateTablesProxyModel>
#include <QList>
#include <KCoreAddons/KPluginMetaData>
#include <KItemModels/KConcatenateRowsProxyModel>
#include <Plasma/DataEngine>
#include <Plasma/DataEngineConsumer>
@ -165,7 +165,7 @@ private:
/**
* @brief Cantenating model for system tray, that can expose multiple data models as one.
*/
class SystemTrayModel : public KConcatenateRowsProxyModel
class SystemTrayModel : public QConcatenateTablesProxyModel
{
Q_OBJECT
public:

Loading…
Cancel
Save