From f4e214a235f6d279a8ae07cf35196b77ac24d283 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 24 Oct 2017 17:07:11 +0200
Subject: [PATCH] Removed main window friendness from device source and sink
 APIs

---
 sdrgui/device/devicesinkapi.h   | 13 ++++++-------
 sdrgui/device/devicesourceapi.h | 12 ++++++------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/sdrgui/device/devicesinkapi.h b/sdrgui/device/devicesinkapi.h
index d586e6fb4..f3e9878ac 100644
--- a/sdrgui/device/devicesinkapi.h
+++ b/sdrgui/device/devicesinkapi.h
@@ -41,6 +41,12 @@ class SDRANGEL_API DeviceSinkAPI : public QObject {
     Q_OBJECT
 
 public:
+    DeviceSinkAPI(int deviceTabIndex,
+            DSPDeviceSinkEngine *deviceEngine,
+            GLSpectrum *glSpectrum,
+            ChannelWindow *channelWindow);
+    ~DeviceSinkAPI();
+
     // Device engine stuff
     void addSpectrumSink(BasebandSampleSink* sink);                //!< Add the spectrum sample sink to device engine (spectrum vis)
     void removeSpectrumSink(BasebandSampleSink* sink);             //!< Remove the spectrum sample sink from device engine (spectrum vis)
@@ -129,12 +135,6 @@ protected:
 
     typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations;
 
-    DeviceSinkAPI(int deviceTabIndex,
-            DSPDeviceSinkEngine *deviceEngine,
-            GLSpectrum *glSpectrum,
-            ChannelWindow *channelWindow);
-    ~DeviceSinkAPI();
-
     void renameChannelInstances();
 
     int m_deviceTabIndex;
@@ -158,7 +158,6 @@ protected:
     bool m_isBuddyLeader;
     const QTimer& m_masterTimer;
 
-    friend class MainWindow;
     friend class DeviceSourceAPI;
 };
 
diff --git a/sdrgui/device/devicesourceapi.h b/sdrgui/device/devicesourceapi.h
index f303822d6..e6ead1370 100644
--- a/sdrgui/device/devicesourceapi.h
+++ b/sdrgui/device/devicesourceapi.h
@@ -43,6 +43,12 @@ class SDRANGEL_API DeviceSourceAPI : public QObject {
     Q_OBJECT
 
 public:
+    DeviceSourceAPI(int deviceTabIndex,
+            DSPDeviceSourceEngine *deviceSourceEngine,
+            GLSpectrum *glSpectrum,
+            ChannelWindow *channelWindow);
+    ~DeviceSourceAPI();
+
     // Device engine stuff
     void addSink(BasebandSampleSink* sink);       //!< Add a sample sink to device engine
     void removeSink(BasebandSampleSink* sink);    //!< Remove a sample sink from device engine
@@ -130,11 +136,6 @@ protected:
 
     typedef QList<ChannelInstanceRegistration> ChannelInstanceRegistrations;
 
-    DeviceSourceAPI(int deviceTabIndex,
-            DSPDeviceSourceEngine *deviceSourceEngine,
-            GLSpectrum *glSpectrum,
-            ChannelWindow *channelWindow);
-    ~DeviceSourceAPI();
 
     void renameChannelInstances();
 
@@ -159,7 +160,6 @@ protected:
     bool m_isBuddyLeader;
     const QTimer& m_masterTimer;
 
-    friend class MainWindow;
     friend class DeviceSinkAPI;
 };