diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-25 10:20:44 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-03-29 16:37:48 +0000 |
| commit | 6466d949dae1724b0c7fea7bff71b893a641d0da (patch) | |
| tree | d7f53451bfd87feb2751f30293afa5f20c4d5e3b /tests | |
| parent | ab32956178331bd323b8341129a237ae0030387b (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
Change-Id: I4f09057cc2f53a5595513c1c9422e6ccaad6ca13
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit c8f6f8a2220ce8fd628c969f19dfae6f38d7311c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp index 4e0b7f46df..0e2765922c 100644 --- a/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp +++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp @@ -47,7 +47,7 @@ #include <qimage.h> #include <qtextlayout.h> #include <QDomDocument> -#include <qurlresourceprovider.h> +#include <qtextdocumentresourceprovider.h> #include "common.h" // #define DEBUG_WRITE_OUTPUT @@ -3596,7 +3596,7 @@ void tst_QTextDocument::clearUndoRedoStacks() QVERIFY(!doc.isUndoAvailable()); } -class UrlResourceProvider : public QUrlResourceProvider +class UrlResourceProvider : public QTextDocumentResourceProvider { public: QVariant resource(const QUrl &url) override diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index 5eed823a34..e4e9d12fb4 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -40,7 +40,7 @@ #include <qmessagebox.h> #include <qfontmetrics.h> #include <qmath.h> -#include <qurlresourceprovider.h> +#include <qtextdocumentresourceprovider.h> #include <private/qlabel_p.h> class Widget : public QWidget @@ -599,7 +599,7 @@ void tst_QLabel::taskQTBUG_48157_dprMovie() QCOMPARE(label.sizeHint(), movie.currentPixmap().size() / movie.currentPixmap().devicePixelRatio()); } -class UrlResourceProvider : public QUrlResourceProvider +class UrlResourceProvider : public QTextDocumentResourceProvider { public: QVariant resource(const QUrl &url) override |