From 2cf54e48922a7d379fb7e212966d05bc402e475d Mon Sep 17 00:00:00 2001 From: Robin Burchell Date: Tue, 10 Mar 2015 13:29:27 +0100 Subject: 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 --- src/webenginewidgets/api/qwebenginescript.cpp | 12 ++++++------ src/webenginewidgets/api/qwebenginescript.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/webenginewidgets/api') 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); -- cgit v1.2.3