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

We don't need anymore the effectModel PROPERTY

Browse source
This commit is contained in:
Antonis Tsiapaliokas 2013-09-09 18:02:27 +03:00 committed by Martin Gräßlin
parent 842bacab23
commit 11c59b7abe
3 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
kcmkwin/kwincompositing/model.cpp
View file

@ -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) {

3
kcmkwin/kwincompositing/model.h
View file

@ -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:

2
kcmkwin/kwincompositing/test/effectmodeltest.cpp
View file

@ -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);
}