diff options
| author | hjk <hjk@qt.io> | 2019-05-28 13:49:26 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-05-28 12:23:26 +0000 |
| commit | 473a741c9fcf09febba312464fab8385e2351181 (patch) | |
| tree | 2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/resourceeditor/resourcenode.cpp | |
| parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff) | |
Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.
Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor/resourcenode.cpp')
| -rw-r--r-- | src/plugins/resourceeditor/resourcenode.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 6a8a33783d..baf214a2be 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -119,7 +119,7 @@ static bool hasPriority(const QStringList &files) return false; } -static bool addFilesToResource(const FileName &resourceFile, +static bool addFilesToResource(const FilePath &resourceFile, const QStringList &filePaths, QStringList *notAdded, const QString &prefix, @@ -157,7 +157,7 @@ class SimpleResourceFolderNode : public FolderNode friend class ResourceEditor::ResourceTopLevelNode; public: SimpleResourceFolderNode(const QString &afolderName, const QString &displayName, - const QString &prefix, const QString &lang, FileName absolutePath, + const QString &prefix, const QString &lang, FilePath absolutePath, ResourceTopLevelNode *topLevel, ResourceFolderNode *prefixNode); bool supportsAction(ProjectAction, const Node *node) const final; @@ -180,7 +180,7 @@ private: SimpleResourceFolderNode::SimpleResourceFolderNode(const QString &afolderName, const QString &displayName, const QString &prefix, const QString &lang, - FileName absolutePath, ResourceTopLevelNode *topLevel, ResourceFolderNode *prefixNode) + FilePath absolutePath, ResourceTopLevelNode *topLevel, ResourceFolderNode *prefixNode) : FolderNode(absolutePath) , m_folderName(afolderName) , m_prefix(prefix) @@ -224,8 +224,8 @@ bool SimpleResourceFolderNode::renameFile(const QString &filePath, const QString } // Internal -ResourceTopLevelNode::ResourceTopLevelNode(const FileName &filePath, - const FileName &base, +ResourceTopLevelNode::ResourceTopLevelNode(const FilePath &filePath, + const FilePath &base, const QString &contents) : FolderNode(filePath) { @@ -328,7 +328,7 @@ void ResourceTopLevelNode::addInternalNodes() const QString absoluteFolderName = filePath().toFileInfo().absoluteDir().absoluteFilePath( currentPathList.join(QLatin1Char('/'))); - const FileName folderPath = FileName::fromString(absoluteFolderName); + const FilePath folderPath = FilePath::fromString(absoluteFolderName); std::unique_ptr<FolderNode> newNode = std::make_unique<SimpleResourceFolderNode>(folderName, pathElement, prefix, lang, folderPath, @@ -351,7 +351,7 @@ void ResourceTopLevelNode::addInternalNodes() FolderNode *fn = folderNodes[folderId]; QTC_CHECK(fn); if (fn) - fn->addNode(std::make_unique<ResourceFileNode>(FileName::fromString(fileName), + fn->addNode(std::make_unique<ResourceFileNode>(FilePath::fromString(fileName), qrcPath, displayName)); } } @@ -623,7 +623,7 @@ ResourceTopLevelNode *ResourceFolderNode::resourceNode() const return m_topLevelNode; } -ResourceFileNode::ResourceFileNode(const FileName &filePath, const QString &qrcPath, const QString &displayName) +ResourceFileNode::ResourceFileNode(const FilePath &filePath, const QString &qrcPath, const QString &displayName) : FileNode(filePath, FileNode::fileTypeForFileName(filePath)) , m_qrcPath(qrcPath) , m_displayName(displayName) |