DeviceGUI: removed destroy method. Part of #2159

plugins/samplesource/rtlsdr/rtlsdrinput.h

@@ -75,10 +75,10 @@ public:
             return new MsgStartStop(startStop);
         }
 
-    protected:
+    private:
         bool m_startStop;
 
-        MsgStartStop(bool startStop) :
+        explicit MsgStartStop(bool startStop) :
             Message(),
             m_startStop(startStop)
         { }
@@ -94,75 +94,75 @@ public:
             return new MsgSaveReplay(filename);
         }
 
-    protected:
+    private:
         QString m_filename;
 
-        MsgSaveReplay(const QString& filename) :
+        explicit MsgSaveReplay(const QString& filename) :
             Message(),
             m_filename(filename)
         { }
     };
 
-	RTLSDRInput(DeviceAPI *deviceAPI);
-	virtual ~RTLSDRInput();
-	virtual void destroy();
+	explicit RTLSDRInput(DeviceAPI *deviceAPI);
+	~RTLSDRInput() final;
+	void destroy() final;
 
-	virtual void init();
-	virtual bool start();
-	virtual void stop();
+	void init() final;
+	bool start() final;
+	void stop() final;
 
-    virtual QByteArray serialize() const;
-    virtual bool deserialize(const QByteArray& data);
+    QByteArray serialize() const final;
+    bool deserialize(const QByteArray& data) final;
 
-    virtual void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; }
-	virtual const QString& getDeviceDescription() const;
-	virtual int getSampleRate() const;
-    virtual void setSampleRate(int sampleRate) { (void) sampleRate; }
-	virtual quint64 getCenterFrequency() const;
-    virtual void setCenterFrequency(qint64 centerFrequency);
+    void setMessageQueueToGUI(MessageQueue *queue) final { m_guiMessageQueue = queue; }
+	const QString& getDeviceDescription() const final;
+	int getSampleRate() const final;
+    void setSampleRate(int sampleRate) final { (void) sampleRate; }
+	quint64 getCenterFrequency() const final;
+    void setCenterFrequency(qint64 centerFrequency) final;
 
-	virtual bool handleMessage(const Message& message);
+	bool handleMessage(const Message& message) final;
 
-    virtual int webapiSettingsGet(
-                SWGSDRangel::SWGDeviceSettings& response,
-                QString& errorMessage);
+    int webapiSettingsGet(
+        SWGSDRangel::SWGDeviceSettings& response,
+        QString& errorMessage) final;
 
-    virtual int webapiSettingsPutPatch(
-                bool force,
-                const QStringList& deviceSettingsKeys,
-                SWGSDRangel::SWGDeviceSettings& response, // query + response
-                QString& errorMessage);
+    int webapiSettingsPutPatch(
+        bool force,
+        const QStringList& deviceSettingsKeys,
+        SWGSDRangel::SWGDeviceSettings& response, // query + response
+        QString& errorMessage) final;
 
-    virtual int webapiReportGet(
-            SWGSDRangel::SWGDeviceReport& response,
-            QString& errorMessage);
+    int webapiReportGet(
+        SWGSDRangel::SWGDeviceReport& response,
+        QString& errorMessage) final;
 
-    virtual int webapiRunGet(
-            SWGSDRangel::SWGDeviceState& response,
-            QString& errorMessage);
+    int webapiRunGet(
+        SWGSDRangel::SWGDeviceState& response,
+        QString& errorMessage) final;
 
-    virtual int webapiRun(
-            bool run,
-            SWGSDRangel::SWGDeviceState& response,
-            QString& errorMessage);
+    int webapiRun(
+        bool run,
+        SWGSDRangel::SWGDeviceState& response,
+        QString& errorMessage) final;
 
 	static void webapiFormatDeviceSettings(
-            SWGSDRangel::SWGDeviceSettings& response,
-            const RTLSDRSettings& settings);
+        SWGSDRangel::SWGDeviceSettings& response,
+        const RTLSDRSettings& settings);
 
     static void webapiUpdateDeviceSettings(
-            RTLSDRSettings& settings,
-            const QStringList& deviceSettingsKeys,
-            SWGSDRangel::SWGDeviceSettings& response);
+        RTLSDRSettings& settings,
+        const QStringList& deviceSettingsKeys,
+        SWGSDRangel::SWGDeviceSettings& response);
 
 	const std::vector<int>& getGains() const { return m_gains; }
     rtlsdr_tuner getTunerType() const { return m_tunerType; }
     QString getTunerName() const;
 	void set_ds_mode(int on);
+    quint64 getFrequencyHighRangeMin() const { return m_frequencyHighRangeMin; }
 
 	static const quint64 frequencyLowRangeMin;
 	static const quint64 frequencyLowRangeMax;
-    quint64 m_frequencyHighRangeMin;
     static const quint64 frequencyHighRangeMax;
 	static const int sampleRateLowRangeMin;
     static const int sampleRateLowRangeMax;
@@ -181,17 +181,18 @@ private:
 	bool m_running;
     QNetworkAccessManager *m_networkManager;
     QNetworkRequest m_networkRequest;
+    quint64 m_frequencyHighRangeMin;
     ReplayBuffer<quint8> m_replayBuffer;
 
 	bool openDevice();
 	void closeDevice();
 	bool applySettings(const RTLSDRSettings& settings, const QList<QString>& settingsKeys, bool force);
-    void webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response);
+    void webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& response) const;
     void webapiReverseSendSettings(const QList<QString>& deviceSettingsKeys, const RTLSDRSettings& settings, bool force);
     void webapiReverseSendStartStop(bool start);
 
 private slots:
-    void networkManagerFinished(QNetworkReply *reply);
+    void networkManagerFinished(QNetworkReply *reply) const;
 };
 
 #endif // INCLUDE_RTLSDRINPUT_H