From 2057c797cb4f4e2bfc3d83d422405b6ed9f24cd5 Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Sat, 4 Jun 2016 01:13:26 +0200
Subject: [PATCH] SetRecordData is not really needed anymore so get rid of it

Always use SetRecordDataFull now.
---
 include/backends/db_backend.hpp           |  1 -
 include/dindexer-machinery/recorddata.hpp | 10 +++-------
 src/backends/postgresql/scan.hpp          |  1 -
 src/machinery/scantask/setbasic.cpp       |  2 --
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/include/backends/db_backend.hpp b/include/backends/db_backend.hpp
index a87596d..b195f78 100644
--- a/include/backends/db_backend.hpp
+++ b/include/backends/db_backend.hpp
@@ -30,7 +30,6 @@
 namespace mchlib {
 	struct TigerHash;
 	struct FileRecordData;
-	struct SetRecordData;
 	struct SetRecordDataFull;
 } //namespace mchlib
 
diff --git a/include/dindexer-machinery/recorddata.hpp b/include/dindexer-machinery/recorddata.hpp
index 29bb653..8ecf5ce 100644
--- a/include/dindexer-machinery/recorddata.hpp
+++ b/include/dindexer-machinery/recorddata.hpp
@@ -130,17 +130,13 @@ namespace mchlib {
 		bool hash_valid;
 	};
 
-	struct SetRecordData {
-		boost::string_ref name;
-		char type;
-		char content_type;
-	};
-
-	struct SetRecordDataFull : public SetRecordData {
+	struct SetRecordDataFull {
 		std::string name;
 		std::string disk_label;
 		std::string fs_uuid;
 		uint32_t disk_number;
+		char type;
+		char content_type;
 	};
 
 #if !defined(NDEBUG)
diff --git a/src/backends/postgresql/scan.hpp b/src/backends/postgresql/scan.hpp
index b8f7482..b270c1a 100644
--- a/src/backends/postgresql/scan.hpp
+++ b/src/backends/postgresql/scan.hpp
@@ -24,7 +24,6 @@
 
 namespace mchlib {
 	struct FileRecordData;
-	struct SetRecordData;
 	struct SetRecordDataFull;
 	struct TigerHash;
 } //namespace mchlib
diff --git a/src/machinery/scantask/setbasic.cpp b/src/machinery/scantask/setbasic.cpp
index 0538aed..f9f4e29 100644
--- a/src/machinery/scantask/setbasic.cpp
+++ b/src/machinery/scantask/setbasic.cpp
@@ -29,13 +29,11 @@ namespace mchlib {
 		}
 
 		void SetBasic::on_data_destroy (SetRecordDataFull& parData) {
-			static_cast<SetRecordData&>(parData).name.clear();
 			parData.name.clear();
 		}
 
 		void SetBasic::on_data_create (SetRecordDataFull& parData) {
 			parData.name = m_set_name;
-			static_cast<SetRecordData&>(parData).name = parData.name;
 		}
 	} //namespace scantask
 } //namespace mchlib