Fixed conflicts in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2020-08-19 16:53:24 -04:00
6 changed files with 12 additions and 5 deletions

View File

@@ -81,6 +81,7 @@ QStringList RDDelete::supportedSchemes() const
schemes.push_back("file");
schemes.push_back("ftp");
schemes.push_back("sftp");
schemes.push_back("ftps");
return schemes;
}
@@ -147,7 +148,7 @@ RDDelete::ErrorCode RDDelete::runDelete(const QString &username,
curl_easy_setopt(curl,CURLOPT_DEBUGFUNCTION,DeleteErrorCallback);
}
if(conv_target_url.scheme().toLower()=="ftp") {
if(conv_target_url.scheme().toLower()=="ftp"||conv_target_url.scheme().toLower()=="ftps") {
QStringList f0=conv_target_url.path().split("/",QString::SkipEmptyParts);
filename=f0.last();
f0.removeLast();

View File

@@ -82,6 +82,7 @@ QStringList RDDownload::supportedSchemes() const
schemes.push_back("file");
schemes.push_back("ftp");
schemes.push_back("ftps");
schemes.push_back("http");
schemes.push_back("https");
schemes.push_back("sftp");

View File

@@ -85,6 +85,7 @@ QStringList RDUpload::supportedSchemes() const
schemes.push_back("file");
schemes.push_back("ftp");
schemes.push_back("sftp");
schemes.push_back("ftps");
return schemes;
}