Browse Source

Change from qDebug to correct qWarning

QGC4.4
DonLakeFlyer 4 years ago committed by Don Gagne
parent
commit
c82a2f3af6
  1. 16
      src/qgcunittest/MultiSignalSpyV2.cc

16
src/qgcunittest/MultiSignalSpyV2.cc

@ -34,7 +34,7 @@ bool MultiSignalSpyV2::init(QObject* signalEmitter)
bool error = false; bool error = false;
if (!signalEmitter) { if (!signalEmitter) {
qDebug() << "No signalEmitter specified"; qWarning() << "No signalEmitter specified";
return false; return false;
} }
@ -46,12 +46,21 @@ bool MultiSignalSpyV2::init(QObject* signalEmitter)
if (method.methodType() == QMetaMethod::Signal) { if (method.methodType() == QMetaMethod::Signal) {
QString signalName = method.name(); QString signalName = method.name();
#if 0
// FIXME: CompexMissionItem has duplicate signals which still need to be fixed
if (signalName != "destroyed" && _rgSignalNames.contains(signalName)) {
qWarning() << "Duplicate signal name" << signalName;
error = true;
break;
}
#endif
_rgSignalNames.append(signalName); _rgSignalNames.append(signalName);
QSignalSpy* spy = new QSignalSpy(_signalEmitter, QStringLiteral("2%1").arg(method.methodSignature().data()).toLocal8Bit().data()); QSignalSpy* spy = new QSignalSpy(_signalEmitter, QStringLiteral("2%1").arg(method.methodSignature().data()).toLocal8Bit().data());
if (spy->isValid()) { if (spy->isValid()) {
_rgSpys.append(spy); _rgSpys.append(spy);
} else { } else {
qDebug() << "Invalid signal:" << signalName; qWarning() << "Invalid signal:" << signalName;
error = true; error = true;
break; break;
} }
@ -78,7 +87,7 @@ bool MultiSignalSpyV2::_checkSignalByMaskWorker(quint64 mask, bool multipleSigna
Q_ASSERT(spy != nullptr); Q_ASSERT(spy != nullptr);
if ((multipleSignalsAllowed && spy->count() == 0) || (!multipleSignalsAllowed && spy->count() != 1)) { if ((multipleSignalsAllowed && spy->count() == 0) || (!multipleSignalsAllowed && spy->count() != 1)) {
qDebug() << "Failed index:" << i; qWarning() << "Failed index:" << i;
_printSignalState(mask); _printSignalState(mask);
return false; return false;
} }
@ -266,7 +275,6 @@ QGeoCoordinate MultiSignalSpyV2::pullQGeoCoordinateFromSignal(const char* signal
quint64 MultiSignalSpyV2::signalNameToMask(const char* signalName) quint64 MultiSignalSpyV2::signalNameToMask(const char* signalName)
{ {
for (int i=0; i<_rgSignalNames.count(); i++) { for (int i=0; i<_rgSignalNames.count(); i++) {
qDebug() << "signalNameToMask" << signalName << _rgSignalNames[i];
if (_rgSignalNames[i] == signalName) { if (_rgSignalNames[i] == signalName) {
return 1ll << i; return 1ll << i;
} }

Loading…
Cancel
Save