Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-25 23:45:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed conflicts with upstream/master

Browse source
This commit is contained in:
csoler 2024-03-26 21:07:57 +01:00
commit 20f4b51bb7
35 changed files with 2061 additions and 2096 deletions
Download patch file Download diff file Expand all files Collapse all files

10
retroshare-gui/src/gui/common/RsCollection.cpp
View file

@ -367,8 +367,10 @@ RsCollection::RsCollection(const QString& fileName, RsCollectionErrorCode& error
return;
}
recursParseXml(xml_doc,root,0);
error = RsCollectionErrorCode::NO_ERROR;
if(!recursParseXml(xml_doc,root,0))
error = RsCollectionErrorCode::XML_PARSING_ERROR;
else
error = RsCollectionErrorCode::NO_ERROR;
}
// check that the file is a valid rscollection file, and not a lol bomb or some shit like this
@ -672,11 +674,11 @@ void RsCollection::saveColl(std::vector<ColFileInfo> colFileInfos, const QString
bool RsCollection::removeFile(RsFileTree::FileIndex index_to_remove,RsFileTree::DirIndex parent_index)
{
mFileTree->removeFile(index_to_remove,parent_index);
return mFileTree->removeFile(index_to_remove,parent_index);
}
bool RsCollection::removeDirectory(RsFileTree::DirIndex index_to_remove,RsFileTree::DirIndex parent_index)
{
mFileTree->removeDirectory(index_to_remove,parent_index);
return mFileTree->removeDirectory(index_to_remove,parent_index);
}
void RsCollection::cleanup()