From f44691b61c423cb272aaaf69025c93c994e3c96d Mon Sep 17 00:00:00 2001
From: Antonis Tsiapaliokas <kok3rs@gmail.com>
Date: Wed, 7 Aug 2013 20:25:04 +0300
Subject: [PATCH] Move findImage method from EffectView to EffectModel

---
 kcmkwin/kwincompositing/model.cpp      | 12 ++++++------
 kcmkwin/kwincompositing/model.h        |  4 ++--
 kcmkwin/kwincompositing/qml/Effect.qml |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/kcmkwin/kwincompositing/model.cpp b/kcmkwin/kwincompositing/model.cpp
index b9be417ed4..e18c19a523 100644
--- a/kcmkwin/kwincompositing/model.cpp
+++ b/kcmkwin/kwincompositing/model.cpp
@@ -134,6 +134,12 @@ QString EffectModel::serviceName(const QString &effectName) {
     return "kwin4_effect_" + effectName.toLower().replace(" ", "");
 }
 
+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;
+}
+
 EffectView::EffectView(QWindow *parent)
     : QQuickView(parent)
 {
@@ -171,11 +177,5 @@ void EffectView::syncConfig() {
     kwinConfig.sync();
 }
 
-QString EffectView::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;
-}
-
 }//end namespace Compositing
 }//end namespace KWin
diff --git a/kcmkwin/kwincompositing/model.h b/kcmkwin/kwincompositing/model.h
index 1e2a96145d..0a5588e1d6 100644
--- a/kcmkwin/kwincompositing/model.h
+++ b/kcmkwin/kwincompositing/model.h
@@ -64,10 +64,11 @@ public:
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     QString serviceName(const QString &effectName);
 
+    Q_INVOKABLE QString findImage(const QString &imagePath, int size = 128);
+
 private:
     void loadEffects();
     QList<EffectData> m_effectsList;
-
 };
 
 class EffectView : public QQuickView {
@@ -81,7 +82,6 @@ public:
 
     Q_INVOKABLE void effectStatus(const QString &effectName, bool status);
     Q_INVOKABLE void syncConfig();
-    Q_INVOKABLE QString findImage(const QString &imagePath, int size = 128);
 
 private:
     QHash<QString, bool> m_effectStatus;
diff --git a/kcmkwin/kwincompositing/qml/Effect.qml b/kcmkwin/kwincompositing/qml/Effect.qml
index 6565c4c413..4c4c143fff 100644
--- a/kcmkwin/kwincompositing/qml/Effect.qml
+++ b/kcmkwin/kwincompositing/qml/Effect.qml
@@ -90,7 +90,7 @@ Component {
                     id: configureButton
                     anchors.left: effectItem.right
                     visible: effectConfig.effectUiConfigExists(model.ServiceNameRole)
-                    iconSource: engineObject.findImage("actions/configure.png")
+                    iconSource: effectModel.findImage("actions/configure.png")
                     width: 50
                     height: 25
                     enabled: myCheckBox.checked
@@ -104,7 +104,7 @@ Component {
                     anchors.left: configureButton.right
                     width: 50
                     height: 25
-                    iconSource: engineObject.findImage("status/dialog-information.png");
+                    iconSource: effectModel.findImage("status/dialog-information.png");
 
                     onClicked: {
                         animationAbout.running = true;