UserScript: Rename source property to sourceCode.

The name 'source' is unclear, and doesn't match current conventions in QtQuick
(e.g. Image::source). Furthermore, such a property inhibits adding convenience
API to fetch a user script from an external URI.

Change-Id: I518b3963f64f0986f9e2d08fe7c5f69122372e0c
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>

7 files changed, 28 insertions, 29 deletions

diff --git a/src/core/user_script.cpp b/src/core/user_script.cpp
index a94b8f16d..39da059d7 100644
--- a/src/core/user_script.cpp
+++ b/src/core/user_script.cpp
@@ -97,14 +97,14 @@ void UserScript::setName(const QString &name)
     scriptData->url = GURL(QStringLiteral("userScript:%1").arg(name).toStdString());
 }
 
-QString UserScript::source() const
+QString UserScript::sourceCode() const
 {
     if (isNull())
         return QString();
     return toQt(scriptData->source);
 }
 
-void UserScript::setSource(const QString &source)
+void UserScript::setSourceCode(const QString &source)
 {
     initData();
     scriptData->source = source.toStdString();
@@ -158,7 +158,7 @@ bool UserScript::operator==(const UserScript &other) const
     return worldId() == other.worldId()
             && runsOnSubFrames() == other.runsOnSubFrames()
             && injectionPoint() == other.injectionPoint()
-            && name() == other.name() && source() == other.source();
+            && name() == other.name() && sourceCode() == other.sourceCode();
 }
 
 void UserScript::initData()
@@ -184,7 +184,7 @@ uint qHash(const QtWebEngineCore::UserScript &script, uint seed)
 {
     if (script.isNull())
         return 0;
-    return qHash(script.source(), seed) ^ qHash(script.name(), seed)
+    return qHash(script.sourceCode(), seed) ^ qHash(script.name(), seed)
            ^ (script.injectionPoint() | (script.runsOnSubFrames() << 4))
            ^ script.worldId();
 }
diff --git a/src/core/user_script.h b/src/core/user_script.h
index a20ac1898..7aeba9131 100644
--- a/src/core/user_script.h
+++ b/src/core/user_script.h
@@ -68,8 +68,8 @@ public:
     QString name() const;
     void setName(const QString &);
 
-    QString source() const;
-    void setSource(const QString &);
+    QString sourceCode() const;
+    void setSourceCode(const QString &);
 
     InjectionPoint injectionPoint() const;
     void setInjectionPoint(InjectionPoint);
diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp
index 8d42d77a3..6ea6d01bc 100644
--- a/src/webengine/api/qquickwebenginescript.cpp
+++ b/src/webengine/api/qquickwebenginescript.cpp
@@ -72,7 +72,7 @@ QString QQuickWebEngineScript::toString() const
     }
     ret.append(QString::number(d->coreScript.worldId()) % QStringLiteral(", ")
                % (d->coreScript.runsOnSubFrames() ? QStringLiteral("true") : QStringLiteral("false"))
-               % QStringLiteral(", ") % d->coreScript.source() % QLatin1Char(')'));
+               % QStringLiteral(", ") % d->coreScript.sourceCode() % QLatin1Char(')'));
     return ret;
 }
 
@@ -83,10 +83,10 @@ QString QQuickWebEngineScript::name() const
 }
 
 
-QString QQuickWebEngineScript::source() const
+QString QQuickWebEngineScript::sourceCode() const
 {
     Q_D(const QQuickWebEngineScript);
-    return d->coreScript.source();
+    return d->coreScript.sourceCode();
 }
 
 ASSERT_ENUMS_MATCH(QQuickWebEngineScript::Deferred, UserScript::AfterLoad)
@@ -124,17 +124,16 @@ void QQuickWebEngineScript::setName(QString arg)
     Q_EMIT nameChanged(arg);
 }
 
-void QQuickWebEngineScript::setSource(QString arg)
+void QQuickWebEngineScript::setSourceCode(QString arg)
 {
     Q_D(QQuickWebEngineScript);
-    if (arg == source())
+    if (arg == sourceCode())
         return;
     d->aboutToUpdateUnderlyingScript();
-    d->coreScript.setSource(arg);
-    Q_EMIT sourceChanged(arg);
+    d->coreScript.setSourceCode(arg);
+    Q_EMIT sourceCodeChanged(arg);
 }
 
-
 void QQuickWebEngineScript::setInjectionPoint(QQuickWebEngineScript::InjectionPoint arg)
 {
     Q_D(QQuickWebEngineScript);
diff --git a/src/webengine/api/qquickwebenginescript_p.h b/src/webengine/api/qquickwebenginescript_p.h
index 4992105fa..55f0c782d 100644
--- a/src/webengine/api/qquickwebenginescript_p.h
+++ b/src/webengine/api/qquickwebenginescript_p.h
@@ -50,7 +50,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineScript : public QObject
     Q_ENUMS(InjectionPoint)
     Q_ENUMS(ScriptWorldId)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
-    Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QString sourceCode READ sourceCode WRITE setSourceCode NOTIFY sourceCodeChanged)
     Q_PROPERTY(InjectionPoint injectionPoint READ injectionPoint WRITE setInjectionPoint NOTIFY injectionPointChanged)
     Q_PROPERTY(ScriptWorldId worldId READ worldId WRITE setWorldId NOTIFY worldIdChanged)
     Q_PROPERTY(bool runOnSubframes READ runOnSubframes WRITE setRunOnSubframes NOTIFY runOnSubframesChanged)
@@ -74,21 +74,21 @@ public:
     Q_INVOKABLE QString toString() const;
 
     QString name() const;
-    QString source() const;
+    QString sourceCode() const;
     InjectionPoint injectionPoint() const;
     ScriptWorldId worldId() const;
     bool runOnSubframes() const;
 
 public Q_SLOTS:
     void setName(QString arg);
-    void setSource(QString arg);
+    void setSourceCode(QString arg);
     void setInjectionPoint(InjectionPoint arg);
     void setWorldId(ScriptWorldId arg);
     void setRunOnSubframes(bool arg);
 
 Q_SIGNALS:
     void nameChanged(QString arg);
-    void sourceChanged(QString arg);
+    void sourceCodeChanged(QString arg);
     void injectionPointChanged(InjectionPoint arg);
     void worldIdChanged(ScriptWorldId arg);
     void runOnSubframesChanged(bool arg);
diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp
index c658c5092..e2f267330 100644
--- a/src/webenginewidgets/api/qwebenginescript.cpp
+++ b/src/webenginewidgets/api/qwebenginescript.cpp
@@ -78,16 +78,16 @@ void QWebEngineScript::setName(const QString &scriptName)
     d->setName(scriptName);
 }
 
-QString QWebEngineScript::source() const
+QString QWebEngineScript::sourceCode() const
 {
-    return d->source();
+    return d->sourceCode();
 }
 
-void QWebEngineScript::setSource(const QString &scriptSource)
+void QWebEngineScript::setSourceCode(const QString &scriptSource)
 {
-    if (scriptSource == source())
+    if (scriptSource == sourceCode())
         return;
-    d->setSource(scriptSource);
+    d->setSourceCode(scriptSource);
 }
 
 ASSERT_ENUMS_MATCH(QWebEngineScript::Deferred, UserScript::AfterLoad)
@@ -159,7 +159,7 @@ QDebug operator<<(QDebug d, const QWebEngineScript &script)
         break;
     }
     d << script.worldId() << ", "
-      << script.runsOnSubFrames() << ", " << script.source() << ")";
+      << script.runsOnSubFrames() << ", " << script.sourceCode() << ")";
     return d.space();
 }
 #endif
diff --git a/src/webenginewidgets/api/qwebenginescript.h b/src/webenginewidgets/api/qwebenginescript.h
index 6eba76932..2b03cd06f 100644
--- a/src/webenginewidgets/api/qwebenginescript.h
+++ b/src/webenginewidgets/api/qwebenginescript.h
@@ -72,8 +72,8 @@ public:
     QString name() const;
     void setName(const QString &);
 
-    QString source() const;
-    void setSource(const QString &);
+    QString sourceCode() const;
+    void setSourceCode(const QString &);
 
     InjectionPoint injectionPoint() const;
     void setInjectionPoint(InjectionPoint);
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index a6d7321b0..1cf2e37c4 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -223,17 +223,17 @@ static QStringList expectedAPI = QStringList()
     << "QQuickWebEngineScript.ApplicationWorld --> ScriptWorldId"
     << "QQuickWebEngineScript.UserWorld --> ScriptWorldId"
     << "QQuickWebEngineScript.name --> QString"
-    << "QQuickWebEngineScript.source --> QString"
+    << "QQuickWebEngineScript.sourceCode --> QString"
     << "QQuickWebEngineScript.injectionPoint --> InjectionPoint"
     << "QQuickWebEngineScript.worldId --> ScriptWorldId"
     << "QQuickWebEngineScript.runOnSubframes --> bool"
     << "QQuickWebEngineScript.nameChanged(QString) --> void"
-    << "QQuickWebEngineScript.sourceChanged(QString) --> void"
+    << "QQuickWebEngineScript.sourceCodeChanged(QString) --> void"
     << "QQuickWebEngineScript.injectionPointChanged(InjectionPoint) --> void"
     << "QQuickWebEngineScript.worldIdChanged(ScriptWorldId) --> void"
     << "QQuickWebEngineScript.runOnSubframesChanged(bool) --> void"
     << "QQuickWebEngineScript.setName(QString) --> void"
-    << "QQuickWebEngineScript.setSource(QString) --> void"
+    << "QQuickWebEngineScript.setSourceCode(QString) --> void"
     << "QQuickWebEngineScript.setInjectionPoint(InjectionPoint) --> void"
     << "QQuickWebEngineScript.setWorldId(ScriptWorldId) --> void"
     << "QQuickWebEngineScript.setRunOnSubframes(bool) --> void"