From ff08041bed20e613eebd4d14b3ad52d040eb65da Mon Sep 17 00:00:00 2001
From: Antonis Tsiapaliokas <kok3rs@gmail.com>
Date: Thu, 29 Aug 2013 13:34:02 +0300
Subject: [PATCH] We don't need the findImage anymore.

---
 kcmkwin/kwincompositing/model.cpp          | 13 -------------
 kcmkwin/kwincompositing/model.h            |  2 --
 kcmkwin/kwincompositing/qml/Effect.qml     | 13 ++-----------
 kcmkwin/kwincompositing/qml/EffectView.qml |  6 ------
 4 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/kcmkwin/kwincompositing/model.cpp b/kcmkwin/kwincompositing/model.cpp
index 76dccf29c7..3708e24192 100644
--- a/kcmkwin/kwincompositing/model.cpp
+++ b/kcmkwin/kwincompositing/model.cpp
@@ -232,14 +232,6 @@ bool EffectModel::effectListContains(const QString &effectFilter, int source_row
 
 }
 
-QString EffectModel::findImage(const QString &imagePath, int size)
-{
-    const QString relativePath("icons/oxygen/" + QString::number(size) + 'x' + QString::number(size) + '/' + imagePath);
-    const QString fullImagePath = QStandardPaths::locate(QStandardPaths::GenericDataLocation, relativePath, QStandardPaths::LocateFile);
-    return fullImagePath;
-}
-
-
 void EffectModel::syncEffectsToKWin()
 {
     QDBusInterface interface(QStringLiteral("org.kde.kwin"), QStringLiteral("/Effects"));
@@ -370,11 +362,6 @@ void EffectFilterModel::effectStatus(int rowIndex, bool effectState)
     m_effectModel->effectStatus(sourceIndex, effectState);
 }
 
-QString EffectFilterModel::findImage(const QString &imagePath, int size)
-{
-    return m_effectModel->findImage(imagePath, size);
-}
-
 void EffectFilterModel::syncConfig()
 {
     m_effectModel->syncConfig();
diff --git a/kcmkwin/kwincompositing/model.h b/kcmkwin/kwincompositing/model.h
index f8e9e271c2..c4bc0e07c0 100644
--- a/kcmkwin/kwincompositing/model.h
+++ b/kcmkwin/kwincompositing/model.h
@@ -76,7 +76,6 @@ public:
     virtual QHash< int, QByteArray > roleNames() const override;
 
     void effectStatus(const QModelIndex &rowIndex, bool effectState);
-    QString findImage(const QString &imagePath, int size = 128);
     void syncEffectsToKWin();
     void syncConfig();
     void enableWidnowManagement(bool enabled);
@@ -113,7 +112,6 @@ public:
     const QString &filter() const;
 
     Q_INVOKABLE void effectStatus(int rowIndex, bool effectState);
-    Q_INVOKABLE QString findImage(const QString &imagePath, int size = 128);
     Q_INVOKABLE void syncConfig();
     Q_INVOKABLE void enableWidnowManagement(bool enabled);
 
diff --git a/kcmkwin/kwincompositing/qml/Effect.qml b/kcmkwin/kwincompositing/qml/Effect.qml
index 1553f7f563..576f72c226 100644
--- a/kcmkwin/kwincompositing/qml/Effect.qml
+++ b/kcmkwin/kwincompositing/qml/Effect.qml
@@ -124,29 +124,20 @@ Component {
                     anchors.right: aboutButton.left
                     visible: effectConfig.effectUiConfigExists(model.ServiceNameRole)
                     enabled: myCheckBox.checked
+                    iconName: "configure"
                     onClicked: {
                         effectConfig.openConfig(model.NameRole);
                     }
-
-                    Component.onCompleted: {
-                        searchModel.image('actions/configure.png')
-                        iconSource = searchModel.imagePath;
-                    }
-
                 }
 
                 Button {
                     id: aboutButton
                     anchors.right: parent.right
+                    iconName: "dialog-information"
                     onClicked: {
                         animationAbout.running = true;
                         animationAboutSpacing.running = true;
                     }
-
-                    Component.onCompleted: {
-                        searchModel.image('status/dialog-information.png')
-                        iconSource = searchModel.imagePath;
-                    }
                 }
 
                 EffectConfig {
diff --git a/kcmkwin/kwincompositing/qml/EffectView.qml b/kcmkwin/kwincompositing/qml/EffectView.qml
index 563f0597e9..e2e18fac00 100644
--- a/kcmkwin/kwincompositing/qml/EffectView.qml
+++ b/kcmkwin/kwincompositing/qml/EffectView.qml
@@ -85,14 +85,8 @@ Item {
             EffectFilterModel {
                 id: searchModel
                 filter: searchField.text
-                property string imagePath
-                signal image(string path)
                 signal effectState(int rowIndex, bool enabled)
 
-                onImage: {
-                    imagePath = searchModel.findImage(path);
-                }
-
                 onEffectState: {
                     searchModel.effectStatus(rowIndex, enabled);
                 }