Browse Source

Constructor should not add itself to LinkManager

QGC4.4
Don Gagne 11 years ago
parent
commit
656fa89770
  1. 4
      src/comm/SerialLink.cc
  2. 3
      src/qgcunittest/MockLink.cc

4
src/comm/SerialLink.cc

@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
#include <QSerialPort>
#include <QSerialPortInfo>
#include "SerialLink.h"
#include "LinkManager.h"
#include "QGC.h"
#include <MG.h>
@ -72,9 +71,6 @@ SerialLink::SerialLink(QString portname, int baudRate, bool hardwareFlowControl, @@ -72,9 +71,6 @@ SerialLink::SerialLink(QString portname, int baudRate, bool hardwareFlowControl,
qDebug() << "create SerialLink " << portname << baudRate << hardwareFlowControl
<< parity << dataBits << stopBits;
qDebug() << "m_portName " << m_portName;
LinkManager::instance()->add(this);
qDebug() << "link added to link manager";
}
void SerialLink::requestReset()

3
src/qgcunittest/MockLink.cc

@ -27,8 +27,6 @@ @@ -27,8 +27,6 @@
#include <QDebug>
#include <QFile>
#include "LinkManager.h"
#include <string.h>
/// @file
@ -53,7 +51,6 @@ MockLink::MockLink(void) : @@ -53,7 +51,6 @@ MockLink::MockLink(void) :
moveToThread(this);
_loadParams();
QObject::connect(this, &MockLink::_incomingBytes, this, &MockLink::_handleIncomingBytes);
LinkManager::instance()->add(this);
}
MockLink::~MockLink(void)

Loading…
Cancel
Save