From c3106613a26639ddb1fd042f386bbca3771cf706 Mon Sep 17 00:00:00 2001
From: "Charles J. Cliffe" <cj@cubicproductions.com>
Date: Mon, 2 Jan 2017 21:27:08 -0500
Subject: [PATCH] Additional license headers, cleanup unused code defs/refs

---
 src/BookmarkMgr.cpp                 | 3 +++
 src/BookmarkMgr.h                   | 3 +++
 src/CubicSDR.h                      | 8 ++------
 src/forms/Bookmark/BookmarkView.cpp | 3 +++
 src/forms/Bookmark/BookmarkView.h   | 3 +++
 src/sdr/SDRPostThread.h             | 4 ----
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/BookmarkMgr.cpp b/src/BookmarkMgr.cpp
index 22e34c7..ae2034c 100644
--- a/src/BookmarkMgr.cpp
+++ b/src/BookmarkMgr.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #include "BookmarkMgr.h"
 #include "CubicSDR.h"
 #include "DataTree.h"
diff --git a/src/BookmarkMgr.h b/src/BookmarkMgr.h
index 101490c..c230b4b 100644
--- a/src/BookmarkMgr.h
+++ b/src/BookmarkMgr.h
@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #pragma once
 
 #include <wx/arrstr.h>
diff --git a/src/CubicSDR.h b/src/CubicSDR.h
index bbd82df..cd2e63e 100644
--- a/src/CubicSDR.h
+++ b/src/CubicSDR.h
@@ -13,12 +13,8 @@
 #include "PrimaryGLContext.h"
 
 #include "ThreadQueue.h"
-#ifdef USE_RTL_SDR
-    #include "SDRThread.h"
-#else
-    #include "SoapySDRThread.h"
-    #include "SDREnumerator.h"
-#endif
+#include "SoapySDRThread.h"
+#include "SDREnumerator.h"
 #include "SDRPostThread.h"
 #include "AudioThread.h"
 #include "DemodulatorMgr.h"
diff --git a/src/forms/Bookmark/BookmarkView.cpp b/src/forms/Bookmark/BookmarkView.cpp
index 6ce6571..763b124 100644
--- a/src/forms/Bookmark/BookmarkView.cpp
+++ b/src/forms/Bookmark/BookmarkView.cpp
@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #include <wx/menu.h>
 #include <wx/textdlg.h>
 
diff --git a/src/forms/Bookmark/BookmarkView.h b/src/forms/Bookmark/BookmarkView.h
index 1307633..dfb26ee 100644
--- a/src/forms/Bookmark/BookmarkView.h
+++ b/src/forms/Bookmark/BookmarkView.h
@@ -1,3 +1,6 @@
+// Copyright (c) Charles J. Cliffe
+// SPDX-License-Identifier: GPL-2.0+
+
 #pragma once
 
 #include "wx/choice.h"
diff --git a/src/sdr/SDRPostThread.h b/src/sdr/SDRPostThread.h
index df3bc8b..d43c9a1 100644
--- a/src/sdr/SDRPostThread.h
+++ b/src/sdr/SDRPostThread.h
@@ -3,11 +3,7 @@
 
 #pragma once
 
-#if USE_RTL_SDR
-#include "SDRThread.h"
-#else
 #include "SoapySDRThread.h"
-#endif
 #include <algorithm>
 
 class SDRPostThread : public IOThread {