From 3d1fc6cd6d5046b05bb4006fe59eb75bd2c02b6b Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Wed, 18 Apr 2012 23:17:29 +0200
Subject: [PATCH] Set the group of the entry in Database::recycleEntry().

Drop Metadata::addEntryToRecycleBin() and add a non-const
Metadata::recycleBin() getter instead.
---
 src/core/Database.cpp |  4 ++--
 src/core/Metadata.cpp | 10 +++++-----
 src/core/Metadata.h   |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/core/Database.cpp b/src/core/Database.cpp
index b71f127f..65ec5b84 100644
--- a/src/core/Database.cpp
+++ b/src/core/Database.cpp
@@ -188,12 +188,12 @@ void Database::recycleEntry(Entry* entry)
         if (!m_metadata->recycleBin()) {
             Group* recycleBin = new Group();
             recycleBin->setUuid(Uuid::random());
-            recycleBin->setName("Recycle Bin");
+            recycleBin->setName(tr("Recycle Bin"));
             recycleBin->setIcon(43);
             recycleBin->setParent(rootGroup());
             m_metadata->setRecycleBin(recycleBin);
         }
-        m_metadata->addEntryToRecycleBin(entry);
+        entry->setGroup(metadata()->recycleBin());
     }
     else {
         delete entry;
diff --git a/src/core/Metadata.cpp b/src/core/Metadata.cpp
index 4182d74f..e549e0d3 100644
--- a/src/core/Metadata.cpp
+++ b/src/core/Metadata.cpp
@@ -167,6 +167,11 @@ bool Metadata::recycleBinEnabled() const
     return m_recycleBinEnabled;
 }
 
+Group* Metadata::recycleBin()
+{
+    return m_recycleBin;
+}
+
 const Group* Metadata::recycleBin() const
 {
     return m_recycleBin;
@@ -372,8 +377,3 @@ void Metadata::removeCustomField(const QString& key)
     m_customFields.remove(key);
     Q_EMIT modified();
 }
-
-void Metadata::addEntryToRecycleBin(Entry* entry)
-{
-    entry->setGroup(m_recycleBin);
-}
diff --git a/src/core/Metadata.h b/src/core/Metadata.h
index 1b93d7df..b2fe3d95 100644
--- a/src/core/Metadata.h
+++ b/src/core/Metadata.h
@@ -26,7 +26,6 @@
 
 class Database;
 class Group;
-class Entry;
 
 class Metadata : public QObject
 {
@@ -52,6 +51,7 @@ public:
     QImage customIcon(const Uuid& uuid) const;
     QHash<Uuid, QImage> customIcons() const;
     bool recycleBinEnabled() const;
+    Group* recycleBin();
     const Group* recycleBin() const;
     QDateTime recycleBinChanged() const;
     const Group* entryTemplatesGroup() const;
@@ -93,8 +93,6 @@ public:
     void removeCustomField(const QString& key);
     void setUpdateDatetime(bool value);
 
-    void addEntryToRecycleBin(Entry* entry);
-
 Q_SIGNALS:
     void nameTextChanged(Database* db);
     void modified();