Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-23 00:10:37 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse source 
# Conflicts:
#	src/core/Group.cpp
This commit is contained in:
Jonathan White 2017-10-01 11:10:10 -04:00
commit 14e3d9d576
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
56 changed files with 13872 additions and 6723 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/Entry.cpp
View file

@ -727,6 +727,13 @@ const Database* Entry::database() const
}
}
QString Entry::maskPasswordPlaceholders(const QString &str) const
{
QString result = str;
result.replace(QRegExp("(\\{PASSWORD\\})", Qt::CaseInsensitive, QRegExp::RegExp2), "******");
return result;
}
QString Entry::resolveMultiplePlaceholders(const QString& str) const
{
QString result = str;
@ -818,4 +825,4 @@ QString Entry::resolveUrl(const QString& url) const
Q_UNUSED(url);
#endif
return QString("");
}
}