From 61eb9e2421b9f06a0a647f215d9ce1a06a1186a0 Mon Sep 17 00:00:00 2001 From: Collin Kidder Date: Wed, 13 May 2015 20:20:16 -0400 Subject: [PATCH] Fix error in serial init caused by the last commit --- mainwindow.cpp | 2 +- mainwindow.h | 2 +- serialworker.cpp | 6 +++--- serialworker.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 1c591e5..ffb9ef5 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -596,7 +596,7 @@ void MainWindow::connButtonPress() { if (ports.at(x).portName() == ui->cbSerialPorts->currentText()) { - emit sendSerialPort(ports[x]); + emit sendSerialPort(&ports[x]); return; } } diff --git a/mainwindow.h b/mainwindow.h index 543b9c4..c6d2250 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -38,7 +38,7 @@ public slots: void gotFrame(CANFrame *frame); signals: - void sendSerialPort(QSerialPortInfo &port); + void sendSerialPort(QSerialPortInfo *port); void updateBaudRates(int, int); void sendCANFrame(const CANFrame *, int); diff --git a/serialworker.cpp b/serialworker.cpp index 232b601..2202c41 100644 --- a/serialworker.cpp +++ b/serialworker.cpp @@ -16,7 +16,7 @@ SerialWorker::~SerialWorker() if (serial != NULL) delete serial; } -void SerialWorker::setSerialPort(QSerialPortInfo &port) +void SerialWorker::setSerialPort(QSerialPortInfo *port) { if (!(serial == NULL)) { @@ -27,9 +27,9 @@ void SerialWorker::setSerialPort(QSerialPortInfo &port) delete serial; } - serial = new QSerialPort(port); + serial = new QSerialPort(*port); - qDebug() << "Serial port name is " << port.portName(); + qDebug() << "Serial port name is " << port->portName(); serial->open(QIODevice::ReadWrite); QByteArray output; output.append(0xE7); diff --git a/serialworker.h b/serialworker.h index 6e764ca..b7d2464 100644 --- a/serialworker.h +++ b/serialworker.h @@ -34,7 +34,7 @@ private slots: //we receive things in slots void readSerialData(); public slots: - void setSerialPort(QSerialPortInfo&); + void setSerialPort(QSerialPortInfo*); void sendFrame(const CANFrame *, int); void updateBaudRates(int, int);