From f934829e0fa8c52aeaf3b8942ba4ba682384377d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Wed, 12 Mar 2014 08:53:03 +0100 Subject: [PATCH] Remove the enableWindowManagement functionality It's all dead code as the glue in the view got removed. --- kcmkwin/kwincompositing/model.cpp | 24 ------------------------ kcmkwin/kwincompositing/model.h | 2 -- kcmkwin/kwincompositing/qml/Effect.qml | 15 --------------- 3 files changed, 41 deletions(-) diff --git a/kcmkwin/kwincompositing/model.cpp b/kcmkwin/kwincompositing/model.cpp index 20dd0c095b..d04adeed31 100644 --- a/kcmkwin/kwincompositing/model.cpp +++ b/kcmkwin/kwincompositing/model.cpp @@ -310,25 +310,6 @@ void EffectModel::syncConfig() syncEffectsToKWin(); } -void EffectModel::enableWidnowManagement(bool enabled) -{ - //Make sure that our effects are being installed properly - if (m_effectsList.size() <= 0) - return; - - int desktopGridRow = findRowByServiceName("kwin4_effect_desktopgrid"); - const QModelIndex desktopGridIndex = createIndex(desktopGridRow, 0); - setData(desktopGridIndex, enabled, EffectModel::WindowManagementRole); - - int dialogParentRow = findRowByServiceName("kwin4_effect_dialogparent"); - const QModelIndex dialogParentIndex = createIndex(dialogParentRow, 0); - setData(dialogParentIndex, enabled, EffectModel::WindowManagementRole); - - int presentWindowsRow = findRowByServiceName("kwin4_effect_presentwindows"); - const QModelIndex presentWindowsIndex = createIndex(presentWindowsRow, 0); - setData(presentWindowsIndex, enabled, EffectModel::WindowManagementRole); -} - void EffectModel::defaults() { for (int i = 0; i < m_effectsList.count(); ++i) { @@ -423,11 +404,6 @@ void EffectFilterModel::syncConfig() m_effectModel->syncConfig(); } -void EffectFilterModel::enableWidnowManagement(bool enabled) -{ - m_effectModel->enableWidnowManagement(enabled); -} - void EffectFilterModel::load() { m_effectModel->loadEffects(); diff --git a/kcmkwin/kwincompositing/model.h b/kcmkwin/kwincompositing/model.h index 04f3e7550d..7bb9812fcb 100644 --- a/kcmkwin/kwincompositing/model.h +++ b/kcmkwin/kwincompositing/model.h @@ -87,7 +87,6 @@ public: void updateEffectStatus(const QModelIndex &rowIndex, bool effectState); void syncEffectsToKWin(); void syncConfig(); - void enableWidnowManagement(bool enabled); void loadEffects(); void defaults(); @@ -143,7 +142,6 @@ public: Q_INVOKABLE void updateEffectStatus(int rowIndex, bool effectState); Q_INVOKABLE void syncConfig(); - Q_INVOKABLE void enableWidnowManagement(bool enabled); Q_INVOKABLE void load(); QColor backgroundActiveColor() { return KColorScheme(QPalette::Active, KColorScheme::Selection, KSharedConfigPtr(0)).background(KColorScheme::LinkBackground).color(); }; diff --git a/kcmkwin/kwincompositing/qml/Effect.qml b/kcmkwin/kwincompositing/qml/Effect.qml index d26464345c..68b409d85c 100644 --- a/kcmkwin/kwincompositing/qml/Effect.qml +++ b/kcmkwin/kwincompositing/qml/Effect.qml @@ -73,22 +73,7 @@ Rectangle { } CheckBox { - function isWindowManagementEnabled() { - if (model.ServiceNameRole == "kwin4_effect_dialogparent") { - windowManagementEnabled = effectStatusCheckBox.checked; - return windowManagementEnabled = effectStatusCheckBox.checked && windowManagementEnabled; - } else if (model.ServiceNameRole == "kwin4_effect_desktopgrid") { - windowManagementEnabled = effectStatusCheckBox.checked; - return windowManagementEnabled = effectStatusCheckBox.checked && windowManagementEnabled; - } else if (model.ServiceNameRole == "kwin4_effect_presentwindows") { - windowManagementEnabled = effectStatusCheckBox.checked; - return windowManagementEnabled = effectStatusCheckBox.checked && windowManagementEnabled; - } - return windowManagementEnabled; - } - id: effectStatusCheckBox - property bool windowManagementEnabled; checked: model.EffectStatusRole visible: model.ExclusiveRole == ""