diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-25 10:20:44 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-29 15:59:40 +0200 |
| commit | c8f6f8a2220ce8fd628c969f19dfae6f38d7311c (patch) | |
| tree | f15d6d21bd491a40a888679b6d008eba6113e2f8 /src/gui/text/qtextdocument.cpp | |
| parent | db1c238a66e3b7ae16768a4e01ce46a51a51eba3 (diff) | |
Rename QUrlResourceProvider to QTextDocumentResourceProvider
While the class name is now a bit more than a mouthful, it's purpose
is very narrowly tied to QTextDocument, so don't use a very generic
name for it. That resources are provided based on a URL is to some
degree an implementation detail, and URLs are resource locators so
we don't need that in the class name.
Address code review comment for 6.1. Add documentation and links to
existing APIs with a similar purpose.
Task-number: QTBUG-90211
Task-number: QTBUG-92208
Pick-to: 6.1
Change-Id: I4f09057cc2f53a5595513c1c9422e6ccaad6ca13
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/gui/text/qtextdocument.cpp')
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 2e9293eb99..9234714f64 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -46,7 +46,7 @@ #include "qtextdocumentfragment_p.h" #include "qtexttable.h" #include "qtextlist.h" -#include "qurlresourceprovider.h" +#include "qtextdocumentresourceprovider.h" #include <qdebug.h> #if QT_CONFIG(regularexpression) #include <qregularexpression.h> @@ -2094,7 +2094,7 @@ QVariant QTextDocument::resource(int type, const QUrl &name) const if (!r.isValid()) { if (d->resourceProvider) r = d->resourceProvider->resource(url); - else if (auto defaultProvider = QUrlResourceProvider::defaultProvider()) + else if (auto defaultProvider = QTextDocumentResourceProvider::defaultProvider()) r = defaultProvider->resource(url); } } @@ -2132,7 +2132,7 @@ void QTextDocument::addResource(int type, const QUrl &name, const QVariant &reso Returns the resource provider for this text document. */ -QUrlResourceProvider *QTextDocument::resourceProvider() const +QTextDocumentResourceProvider *QTextDocument::resourceProvider() const { Q_D(const QTextDocument); return d->resourceProvider; @@ -2145,7 +2145,7 @@ QUrlResourceProvider *QTextDocument::resourceProvider() const \note The text document \e{does not} take ownership of the \a provider. */ -void QTextDocument::setResourceProvider(QUrlResourceProvider *provider) +void QTextDocument::setResourceProvider(QTextDocumentResourceProvider *provider) { Q_D(QTextDocument); d->resourceProvider = provider; @@ -2167,6 +2167,8 @@ void QTextDocument::setResourceProvider(QUrlResourceProvider *provider) loadResource method such as QTextEdit, QTextBrowser or a QTextDocument itself then the default implementation tries to retrieve the data from the parent. + + \sa QTextDocumentResourceProvider */ QVariant QTextDocument::loadResource(int type, const QUrl &name) { |