Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarjolintu <sami.vanttinen@protonmail.com>2020-05-01 11:07:14 +0300
committerJonathan White <support@dmapps.us>2020-05-17 00:41:10 +0300
commite367c6df9584e6a45c9e462fdfa31603a2e21cde (patch)
treef5af852ef88822b540aa759af80a41374c163acd /src/core/CustomData.h
parent48bf4fb85d05c6a7b9540dc71d9f52c7e32c4554 (diff)
Fix merging browser keys
* Introduce protected custom data function to prevent loss during merge operations
Diffstat (limited to 'src/core/CustomData.h')
-rw-r--r--src/core/CustomData.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/CustomData.h b/src/core/CustomData.h
index 212765f76..93b78c46a 100644
--- a/src/core/CustomData.h
+++ b/src/core/CustomData.h
@@ -43,11 +43,14 @@ public:
int dataSize() const;
void copyDataFrom(const CustomData* other);
QDateTime getLastModified() const;
+ bool isProtectedCustomData(const QString& key) const;
bool operator==(const CustomData& other) const;
bool operator!=(const CustomData& other) const;
static const QString LastModified;
static const QString Created;
+ static const QString BrowserKeyPrefix;
+ static const QString BrowserLegacyKeyPrefix;
signals:
void customDataModified();