mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-04-30 09:32:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

#168: unique smart pointers for local variables

Browse Source
This commit is contained in:
Andrey Prygunkov
2016-02-14 17:04:13 +01:00
parent 36fe905bd9
commit c96d2259ce
12 changed files with 126 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
daemon/queue/QueueEditor.cpp
View File

@@ -376,9 +376,12 @@ bool QueueEditor::EditList(DownloadQueue* downloadQueue, IdList* idList, NameLis
m_downloadQueue = downloadQueue;
bool ok = true;
std::unique_ptr<IdList> nameIdList;
if (nameList)
{
idList = new IdList();
nameIdList = std::make_unique<IdList>();
idList = nameIdList.get();
ok = BuildIdListFromNameList(idList, nameList, matchMode, action);
}
@@ -386,11 +389,6 @@ bool QueueEditor::EditList(DownloadQueue* downloadQueue, IdList* idList, NameLis
m_downloadQueue->Save();
if (nameList)
{
delete idList;
}
return ok;
}
@@ -714,13 +712,12 @@ bool QueueEditor::BuildIdListFromNameList(IdList* idList, NameList* nameList, Do
for (CString& name : nameList)
{
RegEx *regEx = nullptr;
std::unique_ptr<RegEx> regEx;
if (matchMode == DownloadQueue::mmRegEx)
{
regEx = new RegEx(name);
regEx = std::make_unique<RegEx>(name);
if (!regEx->IsValid())
{
delete regEx;
return false;
}
}
@@ -759,8 +756,6 @@ bool QueueEditor::BuildIdListFromNameList(IdList* idList, NameList* nameList, Do
}
}
delete regEx;
if (!found && (matchMode == DownloadQueue::mmName))
{
return false;