ResourceEditor: Change signature of ResourceTopLevelNode ctor

Replace the parent node by the only data item it is used for to
make it more clear that this is not about tree structure.

Also move the parameter with possible default to the last position.

Change-Id: Ibf62328dea335b5999595e5cebb36051ec84bc3a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

3 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp
index c7de69cb63..f5c3fa1928 100644
--- a/src/plugins/resourceeditor/resourceeditorplugin.cpp
+++ b/src/plugins/resourceeditor/resourceeditorplugin.cpp
@@ -217,7 +217,7 @@ void ResourceEditorPlugin::extensionsInitialized()
             FolderNode *const pn = file->parentFolderNode();
             QTC_ASSERT(pn, continue);
             const Utils::FileName path = file->filePath();
-            auto topLevel = std::make_unique<ResourceTopLevelNode>(path, QString(), pn);
+            auto topLevel = std::make_unique<ResourceTopLevelNode>(path, pn->filePath());
             topLevel->setIsGenerated(file->isGenerated());
             pn->replaceSubtree(file, std::move(topLevel));
         }
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp
index 8431fa16fe..cc9888ca6a 100644
--- a/src/plugins/resourceeditor/resourcenode.cpp
+++ b/src/plugins/resourceeditor/resourcenode.cpp
@@ -73,7 +73,7 @@ public:
         FolderNode *parent = m_node->parentFolderNode();
         QTC_ASSERT(parent, return false);
         parent->replaceSubtree(m_node, std::make_unique<ResourceTopLevelNode>(
-                                   m_node->filePath(), m_node->contents(), parent));
+                                   m_node->filePath(), parent->filePath(), m_node->contents()));
         return true;
     }
 
@@ -265,7 +265,8 @@ bool SimpleResourceFolderNode::renameFile(const QString &filePath, const QString
 } // Internal
 
 ResourceTopLevelNode::ResourceTopLevelNode(const FileName &filePath,
-                                           const QString &contents, FolderNode *parent)
+                                           const FileName &base,
+                                           const QString &contents)
     : FolderNode(filePath)
 {
     setIcon(FileIconProvider::icon(filePath.toString()));
@@ -283,7 +284,6 @@ ResourceTopLevelNode::ResourceTopLevelNode(const FileName &filePath,
         m_contents = contents;
     }
 
-    FileName base = parent->filePath();
     if (filePath.isChildOf(base))
         setDisplayName(filePath.relativeChildPath(base).toUserOutput());
     else
diff --git a/src/plugins/resourceeditor/resourcenode.h b/src/plugins/resourceeditor/resourcenode.h
index 9d38e3c622..f732c6ae52 100644
--- a/src/plugins/resourceeditor/resourcenode.h
+++ b/src/plugins/resourceeditor/resourcenode.h
@@ -35,7 +35,8 @@ class RESOURCE_EXPORT ResourceTopLevelNode : public ProjectExplorer::FolderNode
 {
 public:
     ResourceTopLevelNode(const Utils::FileName &filePath,
-                         const QString &contents, FolderNode *parent);
+                         const Utils::FileName &basePath,
+                         const QString &contents = {});
     ~ResourceTopLevelNode() override;
 
     void addInternalNodes();