QmlCompiler: Rename ResourceFileMapper

The file class names should start with a common prefix.

Change-Id: I5e014c103668a1bc73d359b00a1dda33e5637a79
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

6 files changed, 19 insertions, 19 deletions

diff --git a/src/qmlcompiler/CMakeLists.txt b/src/qmlcompiler/CMakeLists.txt
index 7a1030b717..e08189857d 100644
--- a/src/qmlcompiler/CMakeLists.txt
+++ b/src/qmlcompiler/CMakeLists.txt
@@ -13,8 +13,8 @@ qt_add_module(QmlCompiler
         qmlstreamwriter.cpp qmlstreamwriter_p.h
         qqmljsimportedmembersvisitor.cpp qqmljsimportedmembersvisitor_p.h
         qqmljsmetatypes_p.h
+        qqmljsresourcefilemapper.cpp qqmljsresourcefilemapper_p.h
         qqmljsscope.cpp qqmljsscope_p.h
-        resourcefilemapper.cpp resourcefilemapper_p.h
         typedescriptionreader.cpp typedescriptionreader_p.h
     PUBLIC_LIBRARIES
         Qt::CorePrivate
diff --git a/src/qmlcompiler/qmlcompiler.pro b/src/qmlcompiler/qmlcompiler.pro
index 255b29aa57..1649855458 100644
--- a/src/qmlcompiler/qmlcompiler.pro
+++ b/src/qmlcompiler/qmlcompiler.pro
@@ -4,7 +4,7 @@ QT         = core-private qmldevtools-private
 CONFIG    += internal_module
 
 SOURCES = \
-    resourcefilemapper.cpp \
+    qqmljsresourcefilemapper.cpp \
     qqmljsimportedmembersvisitor.cpp \
     qmljsimporter.cpp \
     qmljstypereader.cpp \
@@ -13,7 +13,7 @@ SOURCES = \
     qmlstreamwriter.cpp
 
 HEADERS = \
-    resourcefilemapper_p.h \
+    qqmljsresourcefilemapper_p.h \
     qqmljsimportedmembersvisitor_p.h \
     qmljsimporter_p.h \
     qmljstypereader_p.h \
diff --git a/src/qmlcompiler/resourcefilemapper.cpp b/src/qmlcompiler/qqmljsresourcefilemapper.cpp
index d97aa27695..782ad83c43 100644
--- a/src/qmlcompiler/resourcefilemapper.cpp
+++ b/src/qmlcompiler/qqmljsresourcefilemapper.cpp
@@ -26,13 +26,13 @@
 **
 ****************************************************************************/
 
-#include "resourcefilemapper_p.h"
+#include "qqmljsresourcefilemapper_p.h"
 
 #include <QFileInfo>
 #include <QDir>
 #include <QXmlStreamReader>
 
-ResourceFileMapper::ResourceFileMapper(const QStringList &resourceFiles)
+QQmlJSResourceFileMapper::QQmlJSResourceFileMapper(const QStringList &resourceFiles)
 {
     for (const QString &fileName: resourceFiles) {
         QFile f(fileName);
@@ -42,12 +42,12 @@ ResourceFileMapper::ResourceFileMapper(const QStringList &resourceFiles)
     }
 }
 
-bool ResourceFileMapper::isEmpty() const
+bool QQmlJSResourceFileMapper::isEmpty() const
 {
     return qrcPathToFileSystemPath.isEmpty();
 }
 
-QStringList ResourceFileMapper::resourcePaths(const QString &fileName)
+QStringList QQmlJSResourceFileMapper::resourcePaths(const QString &fileName)
 {
     const QString absPath = QDir::cleanPath(QDir::current().absoluteFilePath(fileName));
     QStringList resourcePaths;
@@ -58,7 +58,7 @@ QStringList ResourceFileMapper::resourcePaths(const QString &fileName)
     return resourcePaths;
 }
 
-QStringList ResourceFileMapper::qmlCompilerFiles(FileOutput fo) const
+QStringList QQmlJSResourceFileMapper::qmlCompilerFiles(FileOutput fo) const
 {
     QStringList files;
     for (auto it = qrcPathToFileSystemPath.constBegin(), end = qrcPathToFileSystemPath.constEnd();
@@ -75,7 +75,7 @@ QStringList ResourceFileMapper::qmlCompilerFiles(FileOutput fo) const
     return files;
 }
 
-void ResourceFileMapper::populateFromQrcFile(QFile &file)
+void QQmlJSResourceFileMapper::populateFromQrcFile(QFile &file)
 {
     enum State {
         InitialState,
diff --git a/src/qmlcompiler/resourcefilemapper_p.h b/src/qmlcompiler/qqmljsresourcefilemapper_p.h
index 7fa35e4a6d..50f19fb38a 100644
--- a/src/qmlcompiler/resourcefilemapper_p.h
+++ b/src/qmlcompiler/qqmljsresourcefilemapper_p.h
@@ -25,8 +25,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#ifndef RESOURCEFILEMAPPER_H
-#define RESOURCEFILEMAPPER_H
+#ifndef QQMLJSRESOURCEFILEMAPPER_P_H
+#define QQMLJSRESOURCEFILEMAPPER_P_H
 
 //
 //  W A R N I N G
@@ -42,13 +42,13 @@
 #include <QHash>
 #include <QFile>
 
-struct ResourceFileMapper
+struct QQmlJSResourceFileMapper
 {
     enum class FileOutput {
         RelativeFilePath,
         AbsoluteFilePath
     };
-    ResourceFileMapper(const QStringList &resourceFiles);
+    QQmlJSResourceFileMapper(const QStringList &resourceFiles);
 
     bool isEmpty() const;
 
@@ -61,4 +61,4 @@ private:
     QHash<QString, QString> qrcPathToFileSystemPath;
 };
 
-#endif // RESOURCEFILEMAPPER_H
+#endif // QMLJSRESOURCEFILEMAPPER_P_H
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;