OSDN Git Service

plasma: remove js script engine leftovers
authorIvailo Monev <xakepa10@gmail.com>
Thu, 1 Jul 2021 16:30:34 +0000 (19:30 +0300)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 1 Jul 2021 16:30:34 +0000 (19:30 +0300)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
plasma/scriptengine/plasmoid/appletinterface.cpp
plasma/scriptengine/plasmoid/appletinterface.h

index 7d15acf..c212b41 100644 (file)
@@ -128,21 +128,6 @@ void AppletInterface::setConfigurationRequired(bool needsConfiguring, const QStr
     m_appletScriptEngine->setConfigurationRequired(needsConfiguring, reason);
 }
 
-void JsAppletInterface::update(const QRectF &rect)
-{
-    applet()->update(rect);
-}
-
-QGraphicsLayout *JsAppletInterface::layout() const
-{
-    return applet()->layout();
-}
-
-void JsAppletInterface::setLayout(QGraphicsLayout *layout)
-{
-    applet()->setLayout(layout);
-}
-
 QString AppletInterface::activeConfig() const
 {
     return m_currentConfig.isEmpty() ? "main" : m_currentConfig;
@@ -705,6 +690,4 @@ ToolBoxProxy* ContainmentInterface::toolBox()
     return m_toolBox;
 }
 
-#ifndef USE_JS_SCRIPTENGINE
 #include "moc_appletinterface.cpp"
-#endif
index aa674c4..b5a2f2a 100644 (file)
@@ -332,29 +332,7 @@ private:
     QMap<QString, Plasma::ConfigLoader*> m_configs;
 };
 
-class JsAppletInterface : public AppletInterface
-{
-    Q_OBJECT
-    Q_PROPERTY(QGraphicsLayout *layout WRITE setLayout READ layout)
-    Q_PROPERTY(QObject *sender READ sender)
-
-public:
-    JsAppletInterface(AbstractJsAppletScript *parent)
-        : AppletInterface(parent)
-    {
-    }
-
-    Q_INVOKABLE void update(const QRectF &rect = QRectF());
-    QGraphicsLayout *layout() const;
-    void setLayout(QGraphicsLayout *);
-};
-
-#ifdef USE_JS_SCRIPTENGINE
-#define APPLETSUPERCLASS JsAppletInterface
-#else
-#define APPLETSUPERCLASS AppletInterface
-#endif
-class PopupAppletInterface : public APPLETSUPERCLASS
+class PopupAppletInterface : public AppletInterface
 {
     Q_OBJECT
     Q_PROPERTY(QIcon popupIcon READ popupIcon WRITE setPopupIcon)