refactor: remove unused merge function

This function in unused since we removed the all the unused merge modes in f7fd388
libf-de · Dec 16, 2023 · e355ac5 · e355ac5
1 parent c5e9d35
commit e355ac5
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
@@ -5611,10 +5611,6 @@ We recommend you use the AppImage available on our downloads page.</source>
         <source>Overwriting %1 [%2]</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>older entry merged from database &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Synchronizing from newer source %1 [%2]</source>
         <translation type="unfinished"></translation>

diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
@@ -158,13 +158,6 @@ Merger::resolveGroupConflict(const MergeContext& context, const Group* sourceChi
     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)
 {
     Q_ASSERT(entry);

diff --git a/src/core/Merger.h b/src/core/Merger.h
@@ -49,7 +49,6 @@ class Merger : public QObject
     ChangeList mergeGroup(const MergeContext& context);
     ChangeList mergeDeletions(const MergeContext& context);
     ChangeList mergeMetadata(const MergeContext& context);
-    bool markOlderEntry(Entry* entry);
     bool mergeHistory(const Entry* sourceEntry, Entry* targetEntry, Group::MergeMode mergeMethod);
     void moveEntry(Entry* entry, Group* targetGroup);
     void moveGroup(Group* group, Group* targetGroup);