mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-04 21:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

refactor: remove unused merge function

Browse source 
This function in unused since we removed the all the unused merge modes
in f7fd3881e3
This commit is contained in:
louib 2023-12-15 22:07:56 -05:00 • committed by Jonathan White
parent c5e9d3588a
commit e355ac54b8
3 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
share/translations/keepassxc_en.ts
View file

@ -5611,10 +5611,6 @@ We recommend you use the AppImage available on our downloads page.</source>
<source>Overwriting %1 [%2]</source> <source>Overwriting %1 [%2]</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>older entry merged from database &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Synchronizing from newer source %1 [%2]</source> <source>Synchronizing from newer source %1 [%2]</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

7
src/core/Merger.cpp
View file

@ -158,13 +158,6 @@ Merger::resolveGroupConflict(const MergeContext& context, const Group* sourceChi
return changes; return changes;
} }
bool Merger::markOlderEntry(Entry* entry)
{
entry->attributes()->set(
"merged", tr("older entry merged from database \"%1\"").arg(entry->group()->database()->metadata()->name()));
return true;
}
void Merger::moveEntry(Entry* entry, Group* targetGroup) void Merger::moveEntry(Entry* entry, Group* targetGroup)
{ {
Q_ASSERT(entry); Q_ASSERT(entry);

1
src/core/Merger.h
View file

@ -49,7 +49,6 @@ private:
ChangeList mergeGroup(const MergeContext& context); ChangeList mergeGroup(const MergeContext& context);
ChangeList mergeDeletions(const MergeContext& context); ChangeList mergeDeletions(const MergeContext& context);
ChangeList mergeMetadata(const MergeContext& context); ChangeList mergeMetadata(const MergeContext& context);
bool markOlderEntry(Entry* entry);
bool mergeHistory(const Entry* sourceEntry, Entry* targetEntry, Group::MergeMode mergeMethod); bool mergeHistory(const Entry* sourceEntry, Entry* targetEntry, Group::MergeMode mergeMethod);
void moveEntry(Entry* entry, Group* targetGroup); void moveEntry(Entry* entry, Group* targetGroup);
void moveGroup(Group* group, Group* targetGroup); void moveGroup(Group* group, Group* targetGroup);