diff --git a/plugins/samplesource/rtlsdr/rtlsdrthread.cpp b/plugins/samplesource/rtlsdr/rtlsdrthread.cpp
index adc324432..fc23a5b86 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrthread.cpp
+++ b/plugins/samplesource/rtlsdr/rtlsdrthread.cpp
@@ -374,7 +374,7 @@ void RTLSDRThread::handleInputMessages()
 {
     Message* message;
 
-    while ((message = m_inputMessageQueue.pop()) != 0)
+    while ((message = m_inputMessageQueue.pop()) != nullptr)
     {
         if (handleMessage(*message)) {
             delete message;
@@ -386,7 +386,7 @@ bool RTLSDRThread::handleMessage(const Message& cmd)
 {
     if (RTLSDRInput::MsgConfigureRTLSDR::match(cmd))
     {
-        RTLSDRInput::MsgConfigureRTLSDR& conf = (RTLSDRInput::MsgConfigureRTLSDR&) cmd;
+        auto& conf = (const RTLSDRInput::MsgConfigureRTLSDR&) cmd;
 
         applySettings(conf.getSettings(), conf.getSettingsKeys(), conf.getForce());
 
diff --git a/plugins/samplesource/rtlsdr/rtlsdrthread.h b/plugins/samplesource/rtlsdr/rtlsdrthread.h
index 27394998f..d2f9282f4 100644
--- a/plugins/samplesource/rtlsdr/rtlsdrthread.h
+++ b/plugins/samplesource/rtlsdr/rtlsdrthread.h
@@ -36,7 +36,7 @@ class RTLSDRThread : public QThread {
 	Q_OBJECT
 
 public:
-	RTLSDRThread(rtlsdr_dev_t* dev, SampleSinkFifo* sampleFifo, ReplayBuffer<quint8> *replayBuffer, const RTLSDRSettings& settings, QObject* parent = NULL);
+	RTLSDRThread(rtlsdr_dev_t* dev, SampleSinkFifo* sampleFifo, ReplayBuffer<quint8> *replayBuffer, const RTLSDRSettings& settings, QObject* parent = nullptr);
 	~RTLSDRThread();
 
 	void startWork();