diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2018-04-26 15:35:33 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2018-05-02 14:55:29 +0000 |
commit | 6fbf0255eb8ee674b3211a352735df0b71468ccb (patch) | |
tree | 43334e4aa6dd92cb8bd699f4c3dcf1b55403340e /src/plugins/resourceeditor | |
parent | 8bbe795c39b004e5b421e8bdb8674ce6cba40b3c (diff) | |
download | qt-creator-6fbf0255eb8ee674b3211a352735df0b71468ccb.tar.gz |
ProjectExplorer: Remove FolderNode::addNode taking a raw pointer
Change-Id: I53b765d2c3e71889386c76425662bfcc47bdf582
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/plugins/resourceeditor')
-rw-r--r-- | src/plugins/resourceeditor/resourcenode.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/plugins/resourceeditor/resourcenode.cpp b/src/plugins/resourceeditor/resourcenode.cpp index 9ba9df330f..8ba825cc51 100644 --- a/src/plugins/resourceeditor/resourcenode.cpp +++ b/src/plugins/resourceeditor/resourcenode.cpp @@ -313,9 +313,9 @@ void ResourceTopLevelNode::addInternalNodes() // ensure that we don't duplicate prefixes PrefixFolderLang prefixId(prefix, QString(), lang); if (!folderNodes.contains(prefixId)) { - FolderNode *fn = new ResourceFolderNode(file.prefix(i), file.lang(i), this); - addNode(fn); - folderNodes.insert(prefixId, fn); + auto fn = std::make_unique<ResourceFolderNode>(file.prefix(i), file.lang(i), this); + folderNodes.insert(prefixId, fn.get()); + addNode(std::move(fn)); } ResourceFolderNode *currentPrefixNode = static_cast<ResourceFolderNode*>(folderNodes[prefixId]); @@ -357,19 +357,18 @@ void ResourceTopLevelNode::addInternalNodes() = filePath().toFileInfo().absoluteDir().absoluteFilePath( currentPathList.join(QLatin1Char('/'))); const FileName folderPath = FileName::fromString(absoluteFolderName); - FolderNode *newNode - = new SimpleResourceFolderNode(folderName, pathElement, - prefix, lang, folderPath, - this, currentPrefixNode); - folderNodes.insert(folderId, newNode); + std::unique_ptr<FolderNode> newNode + = std::make_unique<SimpleResourceFolderNode>(folderName, pathElement, + prefix, lang, folderPath, + this, currentPrefixNode); + folderNodes.insert(folderId, newNode.get()); PrefixFolderLang thisPrefixId = prefixId; if (!parentIsPrefix) thisPrefixId = PrefixFolderLang(prefix, parentFolderName, lang); FolderNode *fn = folderNodes[thisPrefixId]; - QTC_CHECK(fn); - if (fn) - fn->addNode(newNode); + if (QTC_GUARD(fn)) + fn->addNode(std::move(newNode)); } parentIsPrefix = false; parentFolderName = folderName; @@ -380,8 +379,8 @@ void ResourceTopLevelNode::addInternalNodes() FolderNode *fn = folderNodes[folderId]; QTC_CHECK(fn); if (fn) - fn->addNode(new ResourceFileNode(FileName::fromString(fileName), - qrcPath, displayName)); + fn->addNode(std::make_unique<ResourceFileNode>(FileName::fromString(fileName), + qrcPath, displayName)); } } } |