diff options
| author | Robin Burchell <robin.burchell@theqtcompany.com> | 2015-03-10 13:29:27 +0100 |
|---|---|---|
| committer | Robin Burchell <robin.burchell@viroteck.net> | 2015-03-12 10:26:00 +0000 |
| commit | 2cf54e48922a7d379fb7e212966d05bc402e475d (patch) | |
| tree | a7668dbe5cfa7f58a87a9fc256f2ff8870891f5e /src/webenginewidgets/api/qwebenginescript.cpp | |
| parent | d3905d85925a950ca32aa78eead6db7228be1330 (diff) | |
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>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginescript.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginescript.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
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 |