Remove qtconnectivity compiler warnings on macOS

- blockByteToAddress is commented out since 2011 => remove
- put dumpServiceInfoAttributes behind similar "#if 0" as its usage

Change-Id: I3d7fb2da45d52c5430c947bca279f2f806b28140
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 6e35417179)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Juha Vuolle 2021-11-28 17:53:04 +02:00 committed by Qt Cherry-pick Bot
parent 806a40cdd3
commit 2fe4b9b72e
2 changed files with 2 additions and 8 deletions

View File

@ -55,11 +55,6 @@ TagBase::~TagBase()
{
}
static inline quint8 blockByteToAddress(quint8 block, quint8 byte)
{
return ((block & 0x0f) << 3) | (byte & 0x07);
}
NfcTagType1::NfcTagType1()
: hr0(0x11), hr1(0x00), memory(120, '\0')
{
@ -119,9 +114,6 @@ void NfcTagType1::load(QSettings *settings)
;
}
//quint16 lock = (quint8(memory[blockByteToAddress(0x0e, 1)]) << 8) |
// quint8(memory[blockByteToAddress(0x0e, 0)]);
settings->endGroup();
}

View File

@ -179,6 +179,7 @@ void tst_QBluetoothServiceDiscoveryAgent::serviceDiscoveryDebug(const QBluetooth
qDebug() << "\tRFCOMM server channel:" << info.serverChannel();
}
#if 0
static void dumpAttributeVariant(const QVariant &var, const QString indent)
{
if (!var.isValid()) {
@ -245,6 +246,7 @@ static inline void dumpServiceInfoAttributes(const QBluetoothServiceInfo &info)
dumpAttributeVariant(info.attribute(id), QString("\t"));
}
}
#endif
void tst_QBluetoothServiceDiscoveryAgent::tst_serviceDiscovery_data()