diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-01 14:42:01 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-10-05 14:58:52 +0200 |
commit | 4f44f82b9f152572222d5d9db78faa5c1db3413c (patch) | |
tree | 6200b69a7b4539880a10a164aedf4cef2d19f175 /src/qmlcompiler | |
parent | c3f1b5a9ae9e4d10232d3234c7f99f10872a0398 (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 'src/qmlcompiler')
-rw-r--r-- | src/qmlcompiler/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/qmlcompiler/qmlcompiler.pro | 4 | ||||
-rw-r--r-- | src/qmlcompiler/qqmljsresourcefilemapper.cpp (renamed from src/qmlcompiler/resourcefilemapper.cpp) | 12 | ||||
-rw-r--r-- | src/qmlcompiler/qqmljsresourcefilemapper_p.h (renamed from src/qmlcompiler/resourcefilemapper_p.h) | 10 |
4 files changed, 14 insertions, 14 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 |