From 64999422842db71efa527c32e2c027072c5d4c95 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Wed, 13 Feb 2013 13:44:56 +0100
Subject: [PATCH] property setters and getters are not invokable

---
 .../qml/plasmoid/appletinterface.cpp          |  2 +-
 scriptengines/qml/plasmoid/appletinterface.h  | 44 ++++++++++---------
 .../qml/plasmoid/declarativeappletscript.h    |  1 -
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/scriptengines/qml/plasmoid/appletinterface.cpp b/scriptengines/qml/plasmoid/appletinterface.cpp
index 9e82b2880..8970ed43f 100644
--- a/scriptengines/qml/plasmoid/appletinterface.cpp
+++ b/scriptengines/qml/plasmoid/appletinterface.cpp
@@ -393,7 +393,7 @@ QVariantList ContainmentInterface::applets()
 
 void ContainmentInterface::setDrawWallpaper(bool drawWallpaper)
 {
-   m_appletScriptEngine->setDrawWallpaper(drawWallpaper);
+    m_appletScriptEngine->setDrawWallpaper(drawWallpaper);
 }
 
 bool ContainmentInterface::drawWallpaper()
diff --git a/scriptengines/qml/plasmoid/appletinterface.h b/scriptengines/qml/plasmoid/appletinterface.h
index f72d9e53e..048fbfce5 100644
--- a/scriptengines/qml/plasmoid/appletinterface.h
+++ b/scriptengines/qml/plasmoid/appletinterface.h
@@ -53,6 +53,7 @@ class AppletInterface : public QQuickItem
     Q_ENUMS(IntervalAlignment)
     Q_ENUMS(ThemeColors)
     Q_ENUMS(ItemStatus)
+
     Q_PROPERTY(FormFactor formFactor READ formFactor NOTIFY formFactorChanged)
     Q_PROPERTY(Location location READ location NOTIFY locationChanged)
     Q_PROPERTY(QString currentActivity READ currentActivity NOTIFY contextChanged)
@@ -141,17 +142,6 @@ enum IntervalAlignment {
 
 //-------------------------------------------------------------------
 
-    Q_INVOKABLE FormFactor formFactor() const;
-
-    Location location() const;
-    QString currentActivity() const;
-
-    Q_INVOKABLE bool isBusy() const;
-    Q_INVOKABLE void setBusy(bool busy);
-
-    Q_INVOKABLE BackgroundHints backgroundHints() const;
-    Q_INVOKABLE void setBackgroundHints(BackgroundHints hint);
-
     Q_INVOKABLE void setConfigurationRequired(bool needsConfiguring, const QString &reason = QString());
 
     Q_INVOKABLE void setActionSeparator(const QString &name);
@@ -162,10 +152,6 @@ enum IntervalAlignment {
 
     Q_INVOKABLE QAction *action(QString name) const;
 
-    Q_INVOKABLE QString activeConfig() const;
-
-    Q_INVOKABLE void setActiveConfig(const QString &name);
-
     Q_INVOKABLE QVariant readConfig(const QString &entry) const;
 
     Q_INVOKABLE void writeConfig(const QString &entry, const QVariant &value);
@@ -178,20 +164,38 @@ enum IntervalAlignment {
     Q_INVOKABLE void debug(const QString &msg);
 
     QList<QAction*> contextualActions() const;
-    bool immutable() const;
-    bool userConfiguring() const;
-    int apiVersion() const;
 
     inline Plasma::Applet *applet() const { return m_appletScriptEngine->applet(); }
 
+//    Q_INVOKABLE QString downloadPath(const QString &file);
+    Q_INVOKABLE QStringList downloadedFiles() const;
+
+
+//PROPERTY ACCESSORS
+    FormFactor formFactor() const;
+
+    Location location() const;
+
+    QString currentActivity() const;
+
+    bool isBusy() const;
+    void setBusy(bool busy);
+
+    BackgroundHints backgroundHints() const;
+    void setBackgroundHints(BackgroundHints hint);
+
     void setAssociatedApplication(const QString &string);
     QString associatedApplication() const;
 
     void setStatus(const ItemStatus &status);
     ItemStatus status() const;
 
-//    Q_INVOKABLE QString downloadPath(const QString &file);
-    Q_INVOKABLE QStringList downloadedFiles() const;
+    QString activeConfig() const;
+    void setActiveConfig(const QString &name);
+
+    bool immutable() const;
+    bool userConfiguring() const;
+    int apiVersion() const;
 
 Q_SIGNALS:
     void releaseVisualFocus();
diff --git a/scriptengines/qml/plasmoid/declarativeappletscript.h b/scriptengines/qml/plasmoid/declarativeappletscript.h
index 6041b571a..b688ba82b 100644
--- a/scriptengines/qml/plasmoid/declarativeappletscript.h
+++ b/scriptengines/qml/plasmoid/declarativeappletscript.h
@@ -76,7 +76,6 @@ private:
     QmlObject *m_qmlObject;
     QmlObject *m_toolBoxObject;
     AppletInterface *m_interface;
-    QObject *m_self;
     ScriptEnv *m_env;
 };