From e85e9f37dba76966c588b15a9e67593cb1cbacb6 Mon Sep 17 00:00:00 2001 From: Ximi1970 Date: Sat, 2 May 2020 15:13:35 +0200 Subject: [PATCH] Cleanup --- app/SysTray-X/systrayxlink.cpp | 137 --------------------------------- app/SysTray-X/systrayxlink.h | 69 ----------------- 2 files changed, 206 deletions(-) diff --git a/app/SysTray-X/systrayxlink.cpp b/app/SysTray-X/systrayxlink.cpp index 94cb0f3..6ecaa23 100644 --- a/app/SysTray-X/systrayxlink.cpp +++ b/app/SysTray-X/systrayxlink.cpp @@ -107,128 +107,6 @@ void SysTrayXLinkReaderThread::run() } -#ifdef OLD_THREAD -/***************************************************************************** - * - * SysTrayXLinkReader Class - * - *****************************************************************************/ - - -/* - * Constructor - */ -SysTrayXLinkReader::SysTrayXLinkReader() -{ - /* - * Set stdin to binary - */ -#ifdef Q_OS_WIN - _setmode( _fileno( stdin ), _O_BINARY); -#endif - - /* - * Setup the timer - */ - m_timer = new QTimer( this ); - m_timer->setSingleShot( true ); - connect( m_timer, &QTimer::timeout, this, &SysTrayXLinkReader::slotWorker ); -} - - -/* - * Destructor - */ -SysTrayXLinkReader::~SysTrayXLinkReader() -{ - /* - * Cleanup - */ - m_timer->stop(); - delete m_timer; -} - - -/* - * Start reading - */ -void SysTrayXLinkReader::startThread() -{ - /* - * Start the work - */ - m_doWork = true; - - /* - * Start the worker - */ - m_timer->start(); -} - - -/* - * Stop viewing - */ -void SysTrayXLinkReader::stopThread() -{ - /* - * Stop working - */ - m_doWork = false; -} - - -/* - * Read the data - */ -void SysTrayXLinkReader::slotWorker() -{ - int error_count = 0; - - while( m_doWork ) - { - qint32 data_len; - std::cin.read( reinterpret_cast< char* >( &data_len ), sizeof( qint32 ) ); - - if( data_len > 0) - { - QByteArray data( data_len, 0 ); - std::cin.read( data.data(), data_len ); - - /* - * Send the data to my parent - */ - emit signalReceivedMessage( data ); - - /* - * Send the data to my parent - */ - if( data.at( 0 ) == '{' ) - { - emit signalReceivedMessage( data ); - - error_count = 0; - } - else - { - error_count++; - - if( error_count > 20 ) - { - emit signalAddOnShutdown(); - } - } - } - } - - /* - * Quit this thread - */ - QThread::currentThread()->quit(); -} - -#endif - /***************************************************************************** * * SysTrayXLink Class @@ -259,21 +137,6 @@ SysTrayXLink::SysTrayXLink( Preferences* pref ) connect( m_reader_thread, &SysTrayXLinkReaderThread::signalReceivedMessage, this, &SysTrayXLink::slotLinkRead ); connect( m_reader_thread, &SysTrayXLinkReaderThread::finished, m_reader_thread, &QObject::deleteLater); m_reader_thread->start(); - -#ifdef OLD_THREAD - m_reader_thread = new QThread( this ); - - SysTrayXLinkReader* reader = new SysTrayXLinkReader; - reader->moveToThread( m_reader_thread ); - - connect( m_reader_thread, &QThread::finished, reader, &QObject::deleteLater ); - connect( reader, &SysTrayXLinkReader::signalReceivedMessage, this, &SysTrayXLink::slotLinkRead ); - connect( reader, &SysTrayXLinkReader::signalAddOnShutdown, this, &SysTrayXLink::slotAddOnShutdown ); - - connect( m_reader_thread, &QThread::started, reader, &SysTrayXLinkReader::startThread, Qt::QueuedConnection ); - m_reader_thread->start(); -#endif - } diff --git a/app/SysTray-X/systrayxlink.h b/app/SysTray-X/systrayxlink.h index 1e6e056..013239d 100644 --- a/app/SysTray-X/systrayxlink.h +++ b/app/SysTray-X/systrayxlink.h @@ -73,68 +73,6 @@ class SysTrayXLinkReaderThread : public QThread }; -#ifdef OLD_THREAD -/** - * @brief The SysTrayXLinkReader class. Reader thread. - */ -class SysTrayXLinkReader : public QObject -{ - Q_OBJECT - - public: - - /** - * @brief Reader. Constructor, destructor. - */ - SysTrayXLinkReader(); - ~SysTrayXLinkReader(); - - /** - * @brief stopThread. Stop the thread. - */ - void stopThread(); - - public slots: - - /** - * @brief startThread. Start the thread. - */ - void startThread(); - - /** - * @brief slotWorker. The worker thread started by a "timer". - */ - void slotWorker(); - - signals: - - /** - * @brief signalReceivedMessage. Signal the received message. - * - * @param message The received message. - */ - void signalReceivedMessage( QByteArray message ); - - /** - * @brief signalAddOnShutdown. Signal to shutdown the app. - */ - void signalAddOnShutdown(); - - private: - - /** - * @brief m_timer. Worker timer. - */ - QTimer* m_timer; - - /** - * @brief m_doWork. Status of the worker thread. - */ - bool m_doWork; -}; -#endif - - /** * @brief The SysTrayXLink class. Handles the communications link. */ @@ -301,13 +239,6 @@ class SysTrayXLink : public QObject */ SysTrayXLinkReaderThread* m_reader_thread; -#ifdef OLD_THREAD - /** - * @brief m_reader_thread. Pointer to the reader thread. - */ - QThread* m_reader_thread; -#endif - /** * @brief m_pref. Pointer to the preferences storage. */