From 11c59b7abef698aa2b474a65935184642494060d Mon Sep 17 00:00:00 2001 From: Antonis Tsiapaliokas Date: Mon, 9 Sep 2013 18:02:27 +0300 Subject: [PATCH] We don't need anymore the effectModel PROPERTY --- kcmkwin/kwincompositing/model.cpp | 16 ---------------- kcmkwin/kwincompositing/model.h | 3 --- kcmkwin/kwincompositing/test/effectmodeltest.cpp | 2 -- 3 files changed, 21 deletions(-) diff --git a/kcmkwin/kwincompositing/model.cpp b/kcmkwin/kwincompositing/model.cpp index f59858bd67..243488ac2e 100644 --- a/kcmkwin/kwincompositing/model.cpp +++ b/kcmkwin/kwincompositing/model.cpp @@ -286,27 +286,11 @@ EffectFilterModel::EffectFilterModel(QObject *parent) setSourceModel(m_effectModel); } -EffectModel *EffectFilterModel::effectModel() const -{ - return m_effectModel; -} - const QString &EffectFilterModel::filter() const { return m_filter; } -void EffectFilterModel::setEffectModel(EffectModel *effectModel) -{ - if (effectModel == m_effectModel) { - return; - } - - m_effectModel = effectModel; - setSourceModel(m_effectModel); - emit effectModelChanged(); -} - void EffectFilterModel::setFilter(const QString &filter) { if (filter == m_filter) { diff --git a/kcmkwin/kwincompositing/model.h b/kcmkwin/kwincompositing/model.h index 690cf6d722..61c4980dbc 100644 --- a/kcmkwin/kwincompositing/model.h +++ b/kcmkwin/kwincompositing/model.h @@ -103,11 +103,9 @@ public: class EffectFilterModel : public QSortFilterProxyModel { Q_OBJECT - Q_PROPERTY(KWin::Compositing::EffectModel *model READ effectModel WRITE setEffectModel NOTIFY effectModelChanged) Q_PROPERTY(QString filter READ filter WRITE setFilter NOTIFY filterChanged) public: EffectFilterModel(QObject *parent = 0); - EffectModel *effectModel() const; const QString &filter() const; Q_INVOKABLE void effectStatus(int rowIndex, bool effectState); @@ -115,7 +113,6 @@ public: Q_INVOKABLE void enableWidnowManagement(bool enabled); public Q_SLOTS: - void setEffectModel(EffectModel *effectModel); void setFilter(const QString &filter); protected: diff --git a/kcmkwin/kwincompositing/test/effectmodeltest.cpp b/kcmkwin/kwincompositing/test/effectmodeltest.cpp index ed0223c2f6..c2043a959c 100644 --- a/kcmkwin/kwincompositing/test/effectmodeltest.cpp +++ b/kcmkwin/kwincompositing/test/effectmodeltest.cpp @@ -36,9 +36,7 @@ void EffectModelTest::testEffectModel() { void EffectModelTest::testEffectFilterModel() { KWin::Compositing::EffectFilterModel *model = new KWin::Compositing::EffectFilterModel(); - KWin::Compositing::EffectModel *effectModel = new KWin::Compositing::EffectModel(); - model->setEffectModel(effectModel); new ModelTest(model, this); }