aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2020-10-01 14:42:01 +0200
committerUlf Hermann <ulf.hermann@qt.io>2020-10-05 14:58:52 +0200
commit4f44f82b9f152572222d5d9db78faa5c1db3413c (patch)
tree6200b69a7b4539880a10a164aedf4cef2d19f175 /tools
parentc3f1b5a9ae9e4d10232d3234c7f99f10872a0398 (diff)
QmlCompiler: Rename ResourceFileMapper
The file class names should start with a common prefix. Change-Id: I5e014c103668a1bc73d359b00a1dda33e5637a79 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmlcachegen/qmlcachegen.cpp6
-rw-r--r--tools/qmlimportscanner/main.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/qmlcachegen/qmlcachegen.cpp b/tools/qmlcachegen/qmlcachegen.cpp
index d8466a2a2d..04d31d8887 100644
--- a/tools/qmlcachegen/qmlcachegen.cpp
+++ b/tools/qmlcachegen/qmlcachegen.cpp
@@ -40,7 +40,7 @@
#include <private/qqmlirbuilder_p.h>
#include <private/qqmljsparser_p.h>
#include <private/qqmljslexer_p.h>
-#include <private/resourcefilemapper_p.h>
+#include <private/qqmljsresourcefilemapper_p.h>
#include <algorithm>
@@ -512,7 +512,7 @@ int main(int argc, char **argv)
}
if (target == GenerateLoader) {
- ResourceFileMapper mapper(sources);
+ QQmlJSResourceFileMapper mapper(sources);
Error error;
if (!generateLoader(mapper.qmlCompilerFiles(), outputFileName,
@@ -536,7 +536,7 @@ int main(int argc, char **argv)
SaveFunction saveFunction;
if (target == GenerateCpp) {
- ResourceFileMapper fileMapper(parser.values(resourceOption));
+ QQmlJSResourceFileMapper fileMapper(parser.values(resourceOption));
QString inputResourcePath = parser.value(resourcePathOption);
if (!inputResourcePath.isEmpty() && !fileMapper.isEmpty()) {
diff --git a/tools/qmlimportscanner/main.cpp b/tools/qmlimportscanner/main.cpp
index 00ad0f0701..5729c74855 100644
--- a/tools/qmlimportscanner/main.cpp
+++ b/tools/qmlimportscanner/main.cpp
@@ -34,7 +34,7 @@
#include <private/qqmlirbuilder_p.h>
#include <private/qqmljsdiagnosticmessage_p.h>
#include <private/qqmldirparser_p.h>
-#include <private/resourcefilemapper_p.h>
+#include <private/qqmljsresourcefilemapper_p.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDir>
@@ -632,7 +632,7 @@ int main(int argc, char *argv[])
}
if (!qrcFiles.isEmpty())
- scanFiles << ResourceFileMapper(qrcFiles).qmlCompilerFiles(ResourceFileMapper::FileOutput::AbsoluteFilePath);
+ scanFiles << QQmlJSResourceFileMapper(qrcFiles).qmlCompilerFiles(QQmlJSResourceFileMapper::FileOutput::AbsoluteFilePath);
g_qmlImportPaths = qmlImportPaths;