summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2019-06-05 14:00:24 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2019-06-05 14:00:24 +0200
commit4b17189cc86b7a2012181eaf9f04941d2300d0a1 (patch)
tree328484349126518e18197e24a48a8290459340b1
parent4443f12461fc9cab42f4229454a390bd9e1ec4a4 (diff)
Fix typo
Change-Id: I06afbe1ba090becfad7620e5bd8deaac35c9f030 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
-rw-r--r--examples/knx/discoverer/main.cpp4
-rw-r--r--examples/knx/knxeditor/mainwindow.cpp6
-rw-r--r--tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp12
3 files changed, 11 insertions, 11 deletions
diff --git a/examples/knx/discoverer/main.cpp b/examples/knx/discoverer/main.cpp
index cce5a52..3cf564b 100644
--- a/examples/knx/discoverer/main.cpp
+++ b/examples/knx/discoverer/main.cpp
@@ -58,7 +58,7 @@
#include <QtNetwork/QNetworkInterface>
-static QString familieToString(QKnxNetIp::ServiceFamily id)
+static QString familyToString(QKnxNetIp::ServiceFamily id)
{
switch (id) {
case QKnxNetIp::ServiceFamily::Core:
@@ -214,7 +214,7 @@ int main(int argc, char *argv[])
qInfo().noquote() << QString::fromLatin1(" Supported services:");
for (const auto service : services) {
qInfo().noquote() << QString::fromLatin1(" KNXnet/IP %1, Version: %2")
- .arg(familieToString(service.ServiceFamily)).arg(service.ServiceFamilyVersion);
+ .arg(familyToString(service.ServiceFamily)).arg(service.ServiceFamilyVersion);
}
const auto dib = server.extendedHardware();
diff --git a/examples/knx/knxeditor/mainwindow.cpp b/examples/knx/knxeditor/mainwindow.cpp
index a06abd5..c967ca2 100644
--- a/examples/knx/knxeditor/mainwindow.cpp
+++ b/examples/knx/knxeditor/mainwindow.cpp
@@ -60,7 +60,7 @@
Ui::MainWindow *MainWindow::s_ui { nullptr };
-static QString familieToString(QKnxNetIp::ServiceFamily id)
+static QString familyToString(QKnxNetIp::ServiceFamily id)
{
switch (id) {
case QKnxNetIp::ServiceFamily::Core:
@@ -201,7 +201,7 @@ void MainWindow::newServerSelected(int serverBoxIndex)
const auto services = info.supportedServices();
for (const auto &service : services) {
value.append(tr("<tr><td class=\"padding\">%1</td></th>")
- .arg(tr("KNXnet/IP %1, Version: %2").arg(familieToString(service.ServiceFamily))
+ .arg(tr("KNXnet/IP %1, Version: %2").arg(familyToString(service.ServiceFamily))
.arg(service.ServiceFamilyVersion)));
if (service.ServiceFamilyVersion >= 2)
version2Supported = true;
@@ -263,7 +263,7 @@ void MainWindow::showServerAndServices(const QKnxNetIpServerInfo &info)
const auto services = info.supportedServices();
for (const auto service : services) {
ui->outputEdit->append(tr(" KNXnet/IP %1, Version: %2")
- .arg(familieToString(service.ServiceFamily)).arg(service.ServiceFamilyVersion));
+ .arg(familyToString(service.ServiceFamily)).arg(service.ServiceFamilyVersion));
}
ui->serverBox->addItem(tr("%1 (%2:%3)").arg(info.deviceName(), info.controlEndpointAddress()
diff --git a/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp b/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp
index bfa5a85..e1a863a 100644
--- a/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp
+++ b/tests/auto/qknxnetipdescriptionresponse/tst_qknxnetipdescriptionresponse.cpp
@@ -156,15 +156,15 @@ void tst_QKnxNetIpDescriptionResponse::testSupportedFamiliesAccessor()
.create();
QKnxNetIpDescriptionResponseProxy descriptionResponse(frame);
- auto familie = descriptionResponse.supportedFamilies();
- const QKnxNetIpServiceFamiliesDibProxy view(familie);
+ auto family = descriptionResponse.supportedFamilies();
+ const QKnxNetIpServiceFamiliesDibProxy view(family);
QCOMPARE(view.isValid(), m_sf.isValid());
QCOMPARE(view.descriptionType(), QKnxNetIpServiceFamiliesDibProxy(m_sf).descriptionType());
- QCOMPARE(familie.size(), m_sf.size());
- QCOMPARE(familie.bytes(), m_sf.bytes());
- QCOMPARE(familie.data().size(), m_sf.data().size());
- QCOMPARE(familie.data(), m_sf.data());
+ QCOMPARE(family.size(), m_sf.size());
+ QCOMPARE(family.bytes(), m_sf.bytes());
+ QCOMPARE(family.data().size(), m_sf.data().size());
+ QCOMPARE(family.data(), m_sf.data());
}
void tst_QKnxNetIpDescriptionResponse::testSupportedFamiliesVersions()