yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EffectFilterModel::findImage should always return a QString

Browse source 
Also translate the rowIndex from the EffectFilterModel to the EffectModel
This commit is contained in:
Antonis Tsiapaliokas 2013-08-28 10:31:57 +03:00 committed by Martin Gräßlin
parent 1f509b7c30
commit 4534cd03b9
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
kcmkwin/kwincompositing/model.cpp
View file

@ -238,9 +238,8 @@ void EffectModel::reload() {
loadEffects(); loadEffects();
} }
void EffectModel::effectStatus(int rowIndex, bool effectState) { void EffectModel::effectStatus(const QModelIndex &rowIndex, bool effectState) {
QModelIndex currentIndex = createIndex(rowIndex, 0); setData(rowIndex, effectState, EffectModel::EffectStatusRole);
setData(currentIndex, effectState, EffectModel::EffectStatusRole);
} }
void EffectModel::syncConfig() { void EffectModel::syncConfig() {
@ -276,9 +275,8 @@ void EffectModel::enableWidnowManagement(bool enabled) {
EffectFilterModel::EffectFilterModel(QObject *parent) EffectFilterModel::EffectFilterModel(QObject *parent)
:QSortFilterProxyModel(parent), :QSortFilterProxyModel(parent),
m_effectModel(0) m_effectModel( new EffectModel(this))
{ {
m_effectModel = new EffectModel(this);
setSourceModel(m_effectModel); setSourceModel(m_effectModel);
} }
@ -338,11 +336,13 @@ bool EffectFilterModel::filterAcceptsRow(int source_row, const QModelIndex &sour
} }
void EffectFilterModel::effectStatus(int rowIndex, bool effectState) { void EffectFilterModel::effectStatus(int rowIndex, bool effectState) {
m_effectModel->effectStatus(rowIndex, effectState); const QModelIndex sourceIndex = mapToSource(index(rowIndex, 0));
m_effectModel->effectStatus(sourceIndex, effectState);
} }
QString EffectFilterModel::findImage(const QString &imagePath, int size) { QString EffectFilterModel::findImage(const QString &imagePath, int size) {
m_effectModel->findImage(imagePath, size); return m_effectModel->findImage(imagePath, size);
} }
void EffectFilterModel::reload() { void EffectFilterModel::reload() {

2
kcmkwin/kwincompositing/model.h
View file

@ -74,7 +74,7 @@ public:
virtual QHash< int, QByteArray > roleNames() const override; virtual QHash< int, QByteArray > roleNames() const override;
void effectStatus(int rowIndex, bool effectState); void effectStatus(const QModelIndex &rowIndex, bool effectState);
QString findImage(const QString &imagePath, int size = 128); QString findImage(const QString &imagePath, int size = 128);
void reload(); void reload();
void syncConfig(); void syncConfig();