Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-24 14:15:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Change EntryAttributes::copyFrom() to copyCustomKeysFrom().

Browse source 
That way we don't overwrite the default entries in EditEntryWidget::saveEntry().
This commit is contained in:
Felix Geyer 2012-04-14 19:38:45 +02:00
parent 51854a7a45
commit 3d7479c67b
3 changed files with 55 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/EntryAttributes.h
View file

@ -34,10 +34,11 @@ public:
bool isProtected(const QString& key) const;
void set(const QString& key, const QString& value, bool protect = false);
void remove(const QString& key);
void copyFrom(const EntryAttributes* other);
void copyCustomKeysFrom(const EntryAttributes* other);
void clear();
bool operator!=(const EntryAttributes& other) const;
bool areCustomKeysDifferent(const EntryAttributes* other);
const static QStringList DEFAULT_ATTRIBUTES;
static bool isDefaultAttribute(const QString& key);
Q_SIGNALS:
@ -54,7 +55,6 @@ Q_SIGNALS:
private:
QMap<QString, QString> m_attributes;
QSet<QString> m_protectedAttributes;
const static QStringList m_defaultAttibutes;
};
#endif // KEEPASSX_ENTRYATTRIBUTES_H