Move sqlite database open/close to a new SQLiteDatabase.

1 files changed, 3 insertions, 6 deletions

diff --git a/src/lib/dkdm_recipient_list.h b/src/lib/dkdm_recipient_list.h
index fc4d84b60..3847239b5 100644
--- a/src/lib/dkdm_recipient_list.h
+++ b/src/lib/dkdm_recipient_list.h
@@ -24,6 +24,7 @@
 
 
 #include "id.h"
+#include "sqlite_database.h"
 #include "sqlite_table.h"
 #include <libcxml/cxml.h>
 #include <boost/filesystem.hpp>
@@ -58,14 +59,10 @@ class DKDMRecipientList
 public:
 	DKDMRecipientList();
 	DKDMRecipientList(boost::filesystem::path db_file);
-	~DKDMRecipientList();
 
 	DKDMRecipientList(DKDMRecipientList const&) = delete;
 	DKDMRecipientList& operator=(DKDMRecipientList const&) = delete;
 
-	DKDMRecipientList(DKDMRecipientList&& other);
-	DKDMRecipientList& operator=(DKDMRecipientList&& other);
-
 	void read_legacy_file(boost::filesystem::path xml_file);
 	void read_legacy_string(std::string const& xml);
 
@@ -78,11 +75,11 @@ public:
 	boost::optional<DKDMRecipient> dkdm_recipient(DKDMRecipientID id) const;
 
 private:
-	void setup(boost::filesystem::path db_file);
+	void setup();
 	void read_legacy_document(cxml::Document const& doc);
 
-	sqlite3* _db = nullptr;
 	SQLiteTable _dkdm_recipients;
+	mutable SQLiteDatabase _db;
 };