From c90153a7503c893fbb45163090c983b5f4e328a2 Mon Sep 17 00:00:00 2001 From: NeoTheFox Date: Sat, 2 May 2015 14:06:54 +0300 Subject: [PATCH] Code cleanup --- mainwindow.cpp | 5 ++--- mainwindow.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index c6c28b0..35a6e0f 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -119,7 +119,6 @@ MainWindow::MainWindow(QWidget *parent) : //Parser thread signal-slots and init parserWorker->moveToThread(parserThread); connect(parserThread, &QThread::finished, parserWorker, &QObject::deleteLater); - connect(this, &MainWindow::receivedData, parserWorker, &Parser::parse); connect(this, &MainWindow::startedReadingEEPROM, parserWorker, &Parser::setEEPROMReadingMode); connect(parserWorker, &Parser::receivedTemperature, this, &MainWindow::updateTemperature); connect(parserWorker, &Parser::receivedSDFilesList, this, &MainWindow::initSDprinting); @@ -140,8 +139,8 @@ MainWindow::MainWindow(QWidget *parent) : connect(parserWorker, &Parser::receivedResend, senderWorker, &Sender::receivedResend); connect(parserWorker, &Parser::receivedStart, senderWorker, &Sender::receivedStart); connect(senderWorker, &Sender::errorReceived, this, &MainWindow::serialError); - connect(senderWorker, &Sender::dataReceived, parserWorker, &Parser::parse, Qt::QueuedConnection); - connect(senderWorker, &Sender::dataReceived, this, &MainWindow::readSerial, Qt::QueuedConnection); + connect(senderWorker, &Sender::dataReceived, parserWorker, &Parser::parse); + connect(senderWorker, &Sender::dataReceived, this, &MainWindow::readSerial); connect(senderWorker, &Sender::reportProgress, this, &MainWindow::updateFileProgress); connect(senderWorker, &Sender::baudrateSetFailed, this, &MainWindow::baudrateSetFailed); connect(this, &MainWindow::setFile, senderWorker, &Sender::setFile); diff --git a/mainwindow.h b/mainwindow.h index bb3b9e4..233c407 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -156,7 +156,6 @@ private slots: signals: void sdReady(); - void receivedData(QByteArray); void startedReadingEEPROM(); void openPort(QSerialPortInfo i);