mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove function isCloudUrl()

Browse source 
The function isCloudUrl() was only called in one place, parse_file().
But, isCloudUrl() could only return true if the filename was of the
git-repository kind (url[branch]). In such a case, control flow would
never reach the point where isCloudUrl() is called, since
is_git_repository() returns non-NULL and the function returns early.

Therefore, remove this function. Moreover, adapt the affected if-statement
by replacing "str && !strcmp(str, ...)" with the more concise
"same_string(str, ...)".

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2017-12-13 20:10:04 +01:00 • committed by Jan Mulder
parent 375490dfc9
commit 074ddc0596
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/qthelper.cpp
View file

@ -1449,16 +1449,6 @@ extern "C" char *cloud_url()
return strdup(filename.toUtf8().data());
}
extern "C" bool isCloudUrl(const char *filename)
{
QString email = QString(prefs.cloud_storage_email);
email.replace(QRegularExpression("[^a-zA-Z0-9@._+-]"), "");
if (!email.isEmpty() &&
QString(QString(prefs.cloud_git_url) + "/%1[%1]").arg(email) == filename)
return true;
return false;
}
extern "C" bool getProxyString(char **buffer)
{
if (prefs.proxy_type == QNetworkProxy::HttpProxy) {