From 656fa897707eb69912840a97a897f5904c8037fc Mon Sep 17 00:00:00 2001 From: Don Gagne <don@thegagnes.com> Date: Wed, 26 Nov 2014 18:28:52 -0800 Subject: [PATCH] Constructor should not add itself to LinkManager --- src/comm/SerialLink.cc | 4 ---- src/qgcunittest/MockLink.cc | 3 --- 2 files changed, 7 deletions(-) diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc index 26dce93..8a5d323 100644 --- a/src/comm/SerialLink.cc +++ b/src/comm/SerialLink.cc @@ -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, 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() diff --git a/src/qgcunittest/MockLink.cc b/src/qgcunittest/MockLink.cc index a28a7e4..8625aeb 100644 --- a/src/qgcunittest/MockLink.cc +++ b/src/qgcunittest/MockLink.cc @@ -27,8 +27,6 @@ #include <QDebug> #include <QFile> -#include "LinkManager.h" - #include <string.h> /// @file @@ -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)