From 1f8f413c8528084d785099502ea419bc0cecd38d Mon Sep 17 00:00:00 2001
From: Phenom <retrosharephenom@gmail.com>
Date: Mon, 16 May 2016 11:32:17 +0200
Subject: [PATCH] Fix RsCollectionFile::load(QString, bool) calls.

Remove "this" as bool parameter.
---
 .../src/gui/FileTransfer/SearchDialog.cpp      | 18 +++++++++---------
 .../src/gui/FileTransfer/TransfersDialog.cpp   | 14 +++++++-------
 retroshare-gui/src/gui/SharedFilesDialog.cpp   | 12 ++++++------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
index 6892ecbb8..a1d1c75ca 100644
--- a/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/SearchDialog.cpp
@@ -535,15 +535,15 @@ void SearchDialog::collOpen()
 				if (qinfo.exists()) {
 					if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
 						RsCollectionFile collection;
-						if (collection.load(qinfo.absoluteFilePath(), this)) {
+						if (collection.load(qinfo.absoluteFilePath())) {
 							collection.downloadFiles();
 							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;
 	if (collection.load(this)) {
@@ -1454,8 +1454,8 @@ void SearchDialog::sendLinkTo( )
 
 void SearchDialog::selectFileType(int index)
 {
-    if (!FileTypeExtensionMap->contains(index) && index != FILETYPE_IDX_DIRECTORY)
-        return;
+	if (!FileTypeExtensionMap->contains(index) && index != FILETYPE_IDX_DIRECTORY)
+		return;
 
 	QString searchId;
 	QTreeWidgetItem *ci = ui.searchSummaryWidget->currentItem();
diff --git a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
index 96ea76bce..3a7f5cf61 100644
--- a/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/FileTransfer/TransfersDialog.cpp
@@ -2170,15 +2170,15 @@ void TransfersDialog::collOpen()
 				if (qinfo.exists()) {
 					if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
 						RsCollectionFile collection;
-						if (collection.load(qinfo.absoluteFilePath(), this)) {
+						if (collection.load(qinfo.absoluteFilePath())) {
 							collection.downloadFiles();
 							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;
 	if (collection.load(this)) {
diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp
index d75606bd9..c3bf94d5a 100644
--- a/retroshare-gui/src/gui/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp
@@ -726,14 +726,14 @@ void SharedFilesDialog::collOpen()
 			if (qinfo.exists()) {
 				if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString)) {
 					RsCollectionFile collection;
-					if (collection.load(qinfo.absoluteFilePath(), this)) {
+					if (collection.load(qinfo.absoluteFilePath())) {
 						collection.downloadFiles();
 						return;
-					}//if (collection.load(this))
-				}//if (qinfo.absoluteFilePath().endsWith(RsCollectionFile::ExtensionString))
-			}//if (qinfo.exists())
-		}//if (rsFiles->FileDetails(
-	}//if(files_info.size() == 1)
+					}
+				}
+			}
+		}
+	}
 
 	RsCollectionFile collection;
 	if (collection.load(this)) {