diff --git a/src/abstractreader.cpp b/src/abstractreader.cpp --- a/src/abstractreader.cpp +++ b/src/abstractreader.cpp @@ -24,3 +24,8 @@ AbstractReader::AbstractReader(QIODevice { _device = device; } + +void AbstractReader::pause(bool enabled) +{ + paused = enabled; +} diff --git a/src/abstractreader.h b/src/abstractreader.h --- a/src/abstractreader.h +++ b/src/abstractreader.h @@ -60,10 +60,11 @@ public slots: * Reader should actually continue reading to keep the * synchronization but shouldn't commit data. */ - virtual void pause(bool) = 0; + void pause(bool enabled); protected: QIODevice* _device; + bool paused; }; #endif // ABSTRACTREADER_H diff --git a/src/asciireader.cpp b/src/asciireader.cpp --- a/src/asciireader.cpp +++ b/src/asciireader.cpp @@ -84,11 +84,6 @@ void AsciiReader::enable(bool enabled) } } -void AsciiReader::pause(bool enabled) -{ - paused = enabled; -} - void AsciiReader::onDataReady() { while(_device->canReadLine()) diff --git a/src/asciireader.h b/src/asciireader.h --- a/src/asciireader.h +++ b/src/asciireader.h @@ -39,16 +39,12 @@ public: /// Loads settings from a `QSettings`. void loadSettings(QSettings* settings); -public slots: - void pause(bool); - private: AsciiReaderSettings _settingsWidget; unsigned _numChannels; /// number of channels will be determined from incoming data unsigned autoNumOfChannels; QChar delimiter; ///< selected column delimiter - bool paused; // We may have (usually true) started reading in the middle of a // line, so its a better idea to just discard first line. diff --git a/src/binarystreamreader.cpp b/src/binarystreamreader.cpp --- a/src/binarystreamreader.cpp +++ b/src/binarystreamreader.cpp @@ -76,11 +76,6 @@ void BinaryStreamReader::enable(bool ena } } -void BinaryStreamReader::pause(bool enabled) -{ - paused = enabled; -} - void BinaryStreamReader::onNumberFormatChanged(NumberFormat numberFormat) { switch(numberFormat) diff --git a/src/binarystreamreader.h b/src/binarystreamreader.h --- a/src/binarystreamreader.h +++ b/src/binarystreamreader.h @@ -43,14 +43,10 @@ public: /// Loads settings from a `QSettings`. void loadSettings(QSettings* settings); -public slots: - void pause(bool); - private: BinaryStreamReaderSettings _settingsWidget; unsigned _numChannels; unsigned sampleSize; - bool paused; bool skipByteRequested; bool skipSampleRequested; diff --git a/src/demoreader.cpp b/src/demoreader.cpp --- a/src/demoreader.cpp +++ b/src/demoreader.cpp @@ -67,11 +67,6 @@ void DemoReader::setNumChannels(unsigned _settingsWidget.setNumChannels(value); } -void DemoReader::pause(bool enabled) -{ - paused = enabled; -} - void DemoReader::demoTimerTimeout() { const double period = 100; diff --git a/src/demoreader.h b/src/demoreader.h --- a/src/demoreader.h +++ b/src/demoreader.h @@ -46,13 +46,11 @@ public: void enable(bool enabled = true); public slots: - void pause(bool); void setNumChannels(unsigned value); private: DemoReaderSettings _settingsWidget; - bool paused; unsigned _numChannels; QTimer timer; int count; diff --git a/src/framedreader.cpp b/src/framedreader.cpp --- a/src/framedreader.cpp +++ b/src/framedreader.cpp @@ -86,11 +86,6 @@ unsigned FramedReader::numChannels() con return _numChannels; } -void FramedReader::pause(bool enabled) -{ - paused = enabled; -} - void FramedReader::onNumberFormatChanged(NumberFormat numberFormat) { switch(numberFormat) diff --git a/src/framedreader.h b/src/framedreader.h --- a/src/framedreader.h +++ b/src/framedreader.h @@ -42,9 +42,6 @@ public: /// Loads settings from a `QSettings`. void loadSettings(QSettings* settings); -public slots: - void pause(bool); - private: /// bit wise fields for `settingsValid` member enum SettingInvalidFlag @@ -57,7 +54,6 @@ private: FramedReaderSettings _settingsWidget; unsigned _numChannels; unsigned sampleSize; - bool paused; unsigned settingsInvalid; /// settings are all valid if this is 0, if not no reading is done QByteArray syncWord; bool checksumEnabled;