diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-07 12:45:05 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-03-10 20:35:16 +0000 |
| commit | 88a48192aafeb2a5d7900afdca10528ddf8c3dbf (patch) | |
| tree | df14705e1aaebec7a60bb33d6f2cd368fccf168b | |
| parent | 1e27219968f760501c99f9f744f172d475a57162 (diff) | |
Fix 5.11 API review findings in QtNetwork
Rename
QNetworkInterface::maxTransmissionUnit()
to
QNetworkInterface::maximumTransmissionUnit()
Change-Id: I24a80b1317363e8d5da5f251ec908da9a51a6b0a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/network/kernel/qnetworkinterface.cpp | 2 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkinterface.h | 2 | ||||
| -rw-r--r-- | tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/network/kernel/qnetworkinterface.cpp b/src/network/kernel/qnetworkinterface.cpp index 70674e9adf..75a26848a6 100644 --- a/src/network/kernel/qnetworkinterface.cpp +++ b/src/network/kernel/qnetworkinterface.cpp @@ -706,7 +706,7 @@ int QNetworkInterface::index() const \sa QUdpSocket */ -int QNetworkInterface::maxTransmissionUnit() const +int QNetworkInterface::maximumTransmissionUnit() const { return d ? d->mtu : 0; } diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index f7ef192dc0..148fd5e10d 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/src/network/kernel/qnetworkinterface.h @@ -153,7 +153,7 @@ public: bool isValid() const; int index() const; - int maxTransmissionUnit() const; + int maximumTransmissionUnit() const; QString name() const; QString humanReadableName() const; InterfaceFlags flags() const; diff --git a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp index 0b4ed4870d..b73ed8eaec 100644 --- a/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp +++ b/tests/auto/network/kernel/qnetworkinterface/tst_qnetworkinterface.cpp @@ -143,7 +143,7 @@ void tst_QNetworkInterface::dump() qDebug() << " flags: " << qPrintable(flags); qDebug() << " type: " << i.type(); qDebug() << " hw address:" << qPrintable(i.hardwareAddress()); - qDebug() << " MTU: " << i.maxTransmissionUnit(); + qDebug() << " MTU: " << i.maximumTransmissionUnit(); int count = 0; foreach (const QNetworkAddressEntry &e, i.addressEntries()) { @@ -187,7 +187,7 @@ void tst_QNetworkInterface::consistencyCheck() if (iface.index()) interfaceIndexes << iface.index(); - QVERIFY(iface.maxTransmissionUnit() >= 0); + QVERIFY(iface.maximumTransmissionUnit() >= 0); const QList<QNetworkAddressEntry> addresses = iface.addressEntries(); for (auto entry : addresses) { @@ -275,7 +275,7 @@ void tst_QNetworkInterface::localAddress() << "pmtu" << pmtu; // check that the Path MTU is less than or equal the interface's MTU - QVERIFY(pmtu <= outgoingIface->maxTransmissionUnit()); + QVERIFY(pmtu <= outgoingIface->maximumTransmissionUnit()); } void tst_QNetworkInterface::interfaceFromXXX_data() |