Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #882 from luzpaz/misc-typo-fixes

Browse Source 
misc. typo fixes
This commit is contained in:
Janek Bevendorff 2017-08-18 22:27:59 +02:00 committed by GitHub
commit cd46a08f4a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Entry.cpp
View File

@ -588,7 +588,7 @@ Entry* Entry::clone(CloneFlags flags) const
entry->m_attachments->copyDataFrom(m_attachments);
if (flags & CloneUserAsRef) {
// Build the username refrence
// Build the username reference
QString username = "{REF:U@I:" + m_uuid.toHex() + "}";
entry->m_attributes->set(EntryAttributes::UserNameKey, username.toUpper(), m_attributes->isProtected(EntryAttributes::UserNameKey));
}

4
src/core/Entry.h
View File

@ -129,8 +129,8 @@ public:
CloneResetTimeInfo = 2, // set all TimeInfo attributes to the current time
CloneIncludeHistory = 4, // clone the history items
CloneRenameTitle = 8, // add "-Clone" after the original title
CloneUserAsRef = 16, // Add the user as a refrence to the origional entry
ClonePassAsRef = 32, // Add the password as a refrence to the origional entry
CloneUserAsRef = 16, // Add the user as a reference to the original entry
ClonePassAsRef = 32, // Add the password as a reference to the original entry
};
Q_DECLARE_FLAGS(CloneFlags, CloneFlag)

2
src/http/Server.cpp
View File

@ -170,7 +170,7 @@ void Server::handleRequest(const QByteArray& data, QHttpResponse* response)
// THIS IS A FAKE HACK!!!
// the real "error" is a misbehavior in the QJSON qobject2qvariant method
// 1. getLogins returns an empty QList<Entry> into protocolResp->m_entries
// in toJson() function the following happend:
// in toJson() function the following happened:
// 2. QJson::QObjectHelper::qobject2qvariant marks m_entries as invalid !!!
// 3. QJson::Serializer write out Entries as null instead of empty list
//(4. ChromeIPass tries to access Entries.length and fails with null pointer exception)