From beadd4d8615453b6b3f8184b830cf1a7a383f11c Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 28 Aug 2015 03:26:57 +0200
Subject: [PATCH] Deep redesign: removed inheritance depedency between bladeRF
 serializer and sample source serializer

---
 include/util/samplesourceserializer.h              | 1 +
 plugins/samplesource/bladerf/bladerfserializer.cpp | 2 +-
 plugins/samplesource/bladerf/bladerfserializer.h   | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/util/samplesourceserializer.h b/include/util/samplesourceserializer.h
index 8d38b2efe..84ce8c21a 100644
--- a/include/util/samplesourceserializer.h
+++ b/include/util/samplesourceserializer.h
@@ -39,6 +39,7 @@ public:
 	static const QByteArray& writeSerializedData(const Data& data);
 	static bool readSerializedData(const QByteArray& serializedData, Data& data);
 	static void setDefaults(Data& data);
+	static uint getSerializerVersion() { return m_version; }
 
 protected:
 	static const uint m_version;
diff --git a/plugins/samplesource/bladerf/bladerfserializer.cpp b/plugins/samplesource/bladerf/bladerfserializer.cpp
index 75b036a42..7991e5c47 100644
--- a/plugins/samplesource/bladerf/bladerfserializer.cpp
+++ b/plugins/samplesource/bladerf/bladerfserializer.cpp
@@ -45,7 +45,7 @@ bool BladeRFSerializer::readSerializedData(const QByteArray& serializedData, Bla
 		return false;
 	}
 
-	if (d.getVersion() == m_version)
+	if (d.getVersion() == SampleSourceSerializer::getSerializerVersion())
 	{
 		int intval;
 
diff --git a/plugins/samplesource/bladerf/bladerfserializer.h b/plugins/samplesource/bladerf/bladerfserializer.h
index 7c661911e..88f932180 100644
--- a/plugins/samplesource/bladerf/bladerfserializer.h
+++ b/plugins/samplesource/bladerf/bladerfserializer.h
@@ -19,12 +19,12 @@
 
 #include "util/samplesourceserializer.h"
 
-class BladeRFSerializer : public SampleSourceSerializer
+class BladeRFSerializer
 {
 public:
 	struct BladeRFData
 	{
-		Data m_data;
+		SampleSourceSerializer::Data m_data;
 		bool m_xb200;
 		quint32 m_xb200Path;
 		quint32 m_xb200Filter;