From 3187651098f47c858d27a3b6403a6bad7d9a15bb Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Sat, 13 Mar 2021 18:56:19 +0000 Subject: [PATCH] Revert changing hex to Qt:hex as Qt:hex not exposed in earlier Qt namespace --- audiohandler.cpp | 4 ++-- rigcommander.cpp | 2 +- udphandler.cpp | 8 ++++---- udpserver.cpp | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/audiohandler.cpp b/audiohandler.cpp index e9b1799..80376cd 100644 --- a/audiohandler.cpp +++ b/audiohandler.cpp @@ -984,7 +984,7 @@ qint64 audioHandler::readData(char* data, qint64 maxlen) { int send = qMin((int)maxlen-sentlen, packet->dataout.length() - packet->sent); lastSeq = packet->seq; - //qDebug(logAudio()) << "Packet " << Qt::hex << packet->seq << " arrived on time " << Qt::dec << packet->time.msecsTo(QTime::currentTime()) << "ms"; + //qDebug(logAudio()) << "Packet " << hex << packet->seq << " arrived on time " << Qt::dec << packet->time.msecsTo(QTime::currentTime()) << "ms"; memcpy(data + sentlen, packet->dataout.constData() + packet->sent, send); @@ -1004,7 +1004,7 @@ qint64 audioHandler::readData(char* data, qint64 maxlen) { // We ended-up with a partial packet left so store where we left off. packet->sent = send; - //qDebug(logAudio()) << "Packet " << Qt::hex << packet->seq << " is partial, sent=" << Qt::dec << packet->sent << " sentlen=" << sentlen; + //qDebug(logAudio()) << "Packet " << hex << packet->seq << " is partial, sent=" << Qt::dec << packet->sent << " sentlen=" << sentlen; break; } } else { diff --git a/rigcommander.cpp b/rigcommander.cpp index 09f9899..3f4127e 100644 --- a/rigcommander.cpp +++ b/rigcommander.cpp @@ -2204,7 +2204,7 @@ void rigCommander::determineRigCaps() payloadPrefix.append(civAddr); payloadPrefix.append((char)compCivAddr); // if there is a compile-time error, remove the following line, the "hex" part is the issue: - qDebug(logRig()) << "Using incomingCIVAddr: (int): " << this->civAddr << " Qt::hex: " << Qt::hex << this->civAddr; + qDebug(logRig()) << "Using incomingCIVAddr: (int): " << this->civAddr << " hex: " << hex << this->civAddr; emit discoveredRigID(rigCaps); } else { emit haveRigID(rigCaps); diff --git a/udphandler.cpp b/udphandler.cpp index 96d19b0..5a9a283 100644 --- a/udphandler.cpp +++ b/udphandler.cpp @@ -1040,7 +1040,7 @@ void udpBase::dataReceived(QByteArray r) return s.seqNum == cs; }); if (match == txSeqBuf.end()) { - qDebug(logUdp()) << this->metaObject()->className() << ": Requested packet " << Qt::hex << seq << " not found"; + qDebug(logUdp()) << this->metaObject()->className() << ": Requested packet " << hex << seq << " not found"; // Just send idle packet. sendControl(false, 0, match->seqNum); } @@ -1067,7 +1067,7 @@ void udpBase::dataReceived(QByteArray r) std::sort(rxSeqBuf.begin(), rxSeqBuf.end()); if (in->seq < rxSeqBuf.front()) { - qDebug(logUdp()) << this->metaObject()->className() << ": ******* seq number may have rolled over ****** previous highest: " << Qt::hex << rxSeqBuf.back() << " current: " << Qt::hex << in->seq; + qDebug(logUdp()) << this->metaObject()->className() << ": ******* seq number may have rolled over ****** previous highest: " << hex << rxSeqBuf.back() << " current: " << hex << in->seq; // Looks like it has rolled over so clear buffer and start again. rxSeqBuf.clear(); @@ -1082,7 +1082,7 @@ void udpBase::dataReceived(QByteArray r) auto s = std::find_if(rxMissing.begin(), rxMissing.end(), [&cs = in->seq](SEQBUFENTRY& s) { return s.seqNum == cs; }); if (s != rxMissing.end()) { - qDebug(logUdp()) << this->metaObject()->className() << ": Missing SEQ has been received! " << Qt::hex << in->seq; + qDebug(logUdp()) << this->metaObject()->className() << ": Missing SEQ has been received! " << hex << in->seq; s = rxMissing.erase(s); } } @@ -1168,7 +1168,7 @@ void udpBase::sendRetransmitRequest() if (missingSeqs.length() == 4) // This is just a single missing packet so send using a control. { p.seq = (missingSeqs[0] & 0xff) | (quint16)(missingSeqs[1] << 8); - qDebug(logUdp()) << this->metaObject()->className() << ": sending request for missing packet : " << Qt::hex << p.seq; + qDebug(logUdp()) << this->metaObject()->className() << ": sending request for missing packet : " << hex << p.seq; QMutexLocker udplocker(&udpMutex); udp->writeDatagram(QByteArray::fromRawData((const char*)p.packet, sizeof(p)), radioIP, port); } diff --git a/udpserver.cpp b/udpserver.cpp index c2b7b9f..c7e55ce 100644 --- a/udpserver.cpp +++ b/udpserver.cpp @@ -584,7 +584,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) // Found matching entry? // Don't constantly retransmit the same packet, give-up eventually QMutexLocker locker(&mutex); - qDebug(logUdpServer()) << this->metaObject()->className() << ": Sending retransmit of " << Qt::hex << match->seqNum; + qDebug(logUdpServer()) << this->metaObject()->className() << ": Sending retransmit of " << hex << match->seqNum; match->retransmitCount++; current->socket->writeDatagram(match->data, current->ipAddress, current->port); } else { @@ -611,7 +611,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) return s.seqNum == cs; }); if (match == current->txSeqBuf.end()) { - qDebug(logUdpServer()) << current->ipAddress.toString() << ":" << current->port << ": Requested packet " << Qt::hex << in->seq << " not found"; + qDebug(logUdpServer()) << current->ipAddress.toString() << ":" << current->port << ": Requested packet " << hex << in->seq << " not found"; // Just send idle packet. sendControl(current, 0, in->seq); } @@ -639,7 +639,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) std::sort(current->rxSeqBuf.begin(), current->rxSeqBuf.end()); if (in->seq < current->rxSeqBuf.front()) { - qDebug(logUdpServer()) << current->ipAddress.toString() << ": ******* seq number may have rolled over ****** previous highest: " << Qt::hex << current->rxSeqBuf.back() << " current: " << Qt::hex << in->seq; + qDebug(logUdpServer()) << current->ipAddress.toString() << ": ******* seq number may have rolled over ****** previous highest: " << hex << current->rxSeqBuf.back() << " current: " << hex << in->seq; // Looks like it has rolled over so clear buffer and start again. current->rxSeqBuf.clear(); return; @@ -653,7 +653,7 @@ void udpServer::commonReceived(QList* l,CLIENT* current, QByteArray r) auto s = std::find_if(current->rxMissing.begin(), current->rxMissing.end(), [&cs = in->seq](SEQBUFENTRY& s) { return s.seqNum == cs; }); if (s != current->rxMissing.end()) { - qDebug(logUdpServer()) << current->ipAddress.toString() << ": Missing SEQ has been received! " << Qt::hex << in->seq; + qDebug(logUdpServer()) << current->ipAddress.toString() << ": Missing SEQ has been received! " << hex << in->seq; s = current->rxMissing.erase(s); } } @@ -1163,7 +1163,7 @@ void udpServer::sendRetransmitRequest(CLIENT *c) if (missingSeqs.length() == 4) // This is just a single missing packet so send using a control. { p.seq = (missingSeqs[0] & 0xff) | (quint16)(missingSeqs[1] << 8); - qDebug(logUdpServer()) << c->ipAddress.toString() << ": sending request for missing packet : " << Qt::hex << p.seq; + qDebug(logUdpServer()) << c->ipAddress.toString() << ": sending request for missing packet : " << hex << p.seq; c->socket->writeDatagram(QByteArray::fromRawData((const char*)p.packet, sizeof(p)), c->ipAddress, c->port); } else