scriptInterface -> scriptEngine

components/interactiveconsole/interactiveconsole.cpp

@@ -232,21 +232,21 @@ QString InteractiveConsole::mode() const
 
 void InteractiveConsole::setScriptInterface(QObject *obj)
 {
-    if (m_interface != obj) {
-        if (m_interface) {
-            disconnect(m_interface, 0, this, 0);
+    if (m_scriptEngine != obj) {
+        if (m_scriptEngine) {
+            disconnect(m_scriptEngine, 0, this, 0);
         }
 
-        m_interface = obj;
-        connect(m_interface, SIGNAL(print(QString)), this, SLOT(print(QString)));
-        connect(m_interface, SIGNAL(printError(QString)), this, SLOT(print(QString)));
-        emit scriptInterfaceChanged();
+        m_scriptEngine = obj;
+        connect(m_scriptEngine, SIGNAL(print(QString)), this, SLOT(print(QString)));
+        connect(m_scriptEngine, SIGNAL(printError(QString)), this, SLOT(print(QString)));
+        emit scriptEngineChanged();
     }
 }
 
-QObject *InteractiveConsole::scriptInterface() const
+QObject *InteractiveConsole::scriptEngine() const
 {
-    return m_interface;
+    return m_scriptEngine;
 }
 
 void InteractiveConsole::loadScript(const QString &script)
@@ -552,9 +552,9 @@ void InteractiveConsole::evaluateScript()
     t.start();
 
     if (m_mode == PlasmaConsole) {
-        if (m_interface) {
+        if (m_scriptEngine) {
             const QString script = m_editorPart ? m_editorPart->text() : m_editor->toPlainText();
-            QMetaObject::invokeMethod(m_interface, "evaluateScript", Q_ARG(QString, script));
+            QMetaObject::invokeMethod(m_scriptEngine, "evaluateScript", Q_ARG(QString, script));
         }
     } else if (m_mode == KWinConsole) {
         QDBusMessage message = QDBusMessage::createMethodCall(s_kwinService, "/Scripting", QString(), "loadScript");

components/interactiveconsole/interactiveconsole.h

@@ -52,7 +52,7 @@ class ScriptEngine;
 class InteractiveConsole : public QDialog
 {
     Q_OBJECT
-    Q_PROPERTY(QObject *scriptInterface READ scriptInterface WRITE setScriptInterface NOTIFY scriptInterfaceChanged)
+    Q_PROPERTY(QObject *scriptEngine READ scriptEngine WRITE setScriptInterface NOTIFY scriptEngineChanged)
     Q_PROPERTY(QString mode READ mode WRITE setMode NOTIFY modeChanged)
 
 public:
@@ -69,10 +69,10 @@ public:
     QString mode() const;
 
     void setScriptInterface(QObject *obj);
-    QObject *scriptInterface() const;
+    QObject *scriptEngine() const;
 
 Q_SIGNALS:
-    void scriptInterfaceChanged();
+    void scriptEngineChanged();
     void modeChanged();
 
 protected:
@@ -122,7 +122,7 @@ private:
     QPointer<KIO::Job> m_job;
     bool m_closeWhenCompleted;
     ConsoleMode m_mode;
-    QPointer<QObject> m_interface;
+    QPointer<QObject> m_scriptEngine;
 };
 
 #endif