Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-07 14:12:43 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix RsCollectionFile::load(QString, bool) calls.

Browse source 
Remove "this" as bool parameter.
This commit is contained in:
Phenom 2016-05-16 11:32:17 +02:00
parent 5d69072c93
commit 1f8f413c85
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
View file

@ -535,15 +535,15 @@ void SearchDialog::collOpen()
if (qinfo.exists()) { if (qinfo.exists()) {
if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) { if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
RsCollectionFile collection; RsCollectionFile collection;
if (collection.load(qinfo.absoluteFilePath(), this)) { if (collection.load(qinfo.absoluteFilePath())) {
collection.downloadFiles(); collection.downloadFiles();
return; return;
}//if (collection.load(this)) }
}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) }
}//if (qinfo.exists()) }
}//if (!rsFiles->FileDetails( }
}//if (!item->data(SR_DATA_COL, SR_ROLE_LOCAL).toBool()) }
}//if (selectedItems.size() != 1) }
RsCollectionFile collection; RsCollectionFile collection;
if (collection.load(this)) { if (collection.load(this)) {
@ -1454,8 +1454,8 @@ void SearchDialog::sendLinkTo( )
void SearchDialog::selectFileType(int index) void SearchDialog::selectFileType(int index)
{ {
if (!FileTypeExtensionMap->contains(index) && index != FILETYPE_IDX_DIRECTORY) if (!FileTypeExtensionMap->contains(index) && index != FILETYPE_IDX_DIRECTORY)
return; return;
QString searchId; QString searchId;
QTreeWidgetItem *ci = ui.searchSummaryWidget->currentItem(); QTreeWidgetItem *ci = ui.searchSummaryWidget->currentItem();

14
retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
View file

@ -2170,15 +2170,15 @@ void TransfersDialog::collOpen()
if (qinfo.exists()) { if (qinfo.exists()) {
if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) { if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
RsCollectionFile collection; RsCollectionFile collection;
if (collection.load(qinfo.absoluteFilePath(), this)) { if (collection.load(qinfo.absoluteFilePath())) {
collection.downloadFiles(); collection.downloadFiles();
return; return;
}//if (collection.load(this)) }
}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) }
}//if (qinfo.exists()) }
}//if (info.downloadStatus == FT_STATE_COMPLETE) }
}//if (rsFiles->FileDetails( }
}//if (items.size() == 1) }
RsCollectionFile collection; RsCollectionFile collection;
if (collection.load(this)) { if (collection.load(this)) {

12
retroshare-gui/src/gui/SharedFilesDialog.cpp
View file

@ -726,14 +726,14 @@ void SharedFilesDialog::collOpen()
if (qinfo.exists()) { if (qinfo.exists()) {
if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) { if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
RsCollectionFile collection; RsCollectionFile collection;
if (collection.load(qinfo.absoluteFilePath(), this)) { if (collection.load(qinfo.absoluteFilePath())) {
collection.downloadFiles(); collection.downloadFiles();
return; return;
}//if (collection.load(this)) }
}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) }
}//if (qinfo.exists()) }
}//if (rsFiles->FileDetails( }
}//if(files_info.size() == 1) }
RsCollectionFile collection; RsCollectionFile collection;
if (collection.load(this)) { if (collection.load(this)) {