EQ-3: Fix MaxCube building with latest gcc
This commit is contained in:
parent
10c54614d6
commit
628edd77ce
@ -39,7 +39,7 @@ MaxCube::MaxCube(QObject *parent, QString serialNumber, QHostAddress hostAdress,
|
|||||||
|
|
||||||
connect(this,SIGNAL(stateChanged(QAbstractSocket::SocketState)),this,SLOT(connectionStateChanged(QAbstractSocket::SocketState)));
|
connect(this,SIGNAL(stateChanged(QAbstractSocket::SocketState)),this,SLOT(connectionStateChanged(QAbstractSocket::SocketState)));
|
||||||
|
|
||||||
connect(this,SIGNAL(readyRead()),this,SLOT(readData()));
|
connect(this,SIGNAL(readyRead()),this,SLOT(onReadyRead()));
|
||||||
connect(this,SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(error(QAbstractSocket::SocketError)));
|
connect(this,SIGNAL(error(QAbstractSocket::SocketError)),this,SLOT(error(QAbstractSocket::SocketError)));
|
||||||
|
|
||||||
connect(this,SIGNAL(cubeDataAvailable(QByteArray)),this,SLOT(processCubeData(QByteArray)));
|
connect(this,SIGNAL(cubeDataAvailable(QByteArray)),this,SLOT(processCubeData(QByteArray)));
|
||||||
@ -721,7 +721,7 @@ void MaxCube::error(QAbstractSocket::SocketError error)
|
|||||||
emit cubeConnectionStatusChanged(false);
|
emit cubeConnectionStatusChanged(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void MaxCube::readData()
|
void MaxCube::onReadyRead()
|
||||||
{
|
{
|
||||||
QByteArray message;
|
QByteArray message;
|
||||||
while(canReadLine()){
|
while(canReadLine()){
|
||||||
|
|||||||
@ -122,7 +122,7 @@ signals:
|
|||||||
private slots:
|
private slots:
|
||||||
void connectionStateChanged(const QAbstractSocket::SocketState &socketState);
|
void connectionStateChanged(const QAbstractSocket::SocketState &socketState);
|
||||||
void error(QAbstractSocket::SocketError error);
|
void error(QAbstractSocket::SocketError error);
|
||||||
void readData();
|
void onReadyRead();
|
||||||
void processCubeData(const QByteArray &data);
|
void processCubeData(const QByteArray &data);
|
||||||
|
|
||||||
void processCommandQueue();
|
void processCommandQueue();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user