Move QKnxNetIpServiceFamiliesDib to QKnxNetIpServiceFamiliesDibView

Change-Id: I79ec5103b01a1b3b5eb9ba15308007be56f8e8cf
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

2 files changed, 27 insertions, 27 deletions

diff --git a/examples/knx/discoverer/main.cpp b/examples/knx/discoverer/main.cpp
index 7e234d2..ea6924c 100644
--- a/examples/knx/discoverer/main.cpp
+++ b/examples/knx/discoverer/main.cpp
@@ -54,22 +54,22 @@
 #include <QtKnx/QKnxNetIpServerDiscoveryAgent>
 #include <QtNetwork/QNetworkInterface>
 
-static QString familieToString(QKnxNetIpServiceFamiliesDib::ServiceFamilieId id)
+static QString familieToString(QKnxNetIp::ServiceFamily id)
 {
     switch (id) {
-        case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::Core:
+        case QKnxNetIp::ServiceFamily::Core:
             return "Core";
-        case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::DeviceManagement:
+        case QKnxNetIp::ServiceFamily::DeviceManagement:
             return "Device Management";
-        case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::IpTunneling:
+        case QKnxNetIp::ServiceFamily::IpTunneling:
             return "Tunnel";
-        case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::IpRouting:
+        case QKnxNetIp::ServiceFamily::IpRouting:
             return "Routing";
-        case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::RemoteLogging:
+        case QKnxNetIp::ServiceFamily::RemoteLogging:
             return "Remote Logging";
-        case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::RemoteConfigAndDiagnosis:
+        case QKnxNetIp::ServiceFamily::RemoteConfigAndDiagnosis:
             return "Remote Configuration";
-        case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::ObjectServer:
+        case QKnxNetIp::ServiceFamily::ObjectServer:
             return "Object Server";
         default:
             break;
@@ -139,11 +139,11 @@ int main(int argc, char *argv[])
             qInfo().noquote() << QString::fromLatin1("      Server control endpoint: %1:%2")
                 .arg(server.controlEndpointAddress().toString()).arg(server.controlEndpointPort());
 
-            auto services = server.supportedServices();
+            const auto services = server.supportedServices();
             qInfo().noquote() << QString::fromLatin1("    Supported services:");
-            for (auto it = services.constBegin(); it != services.constEnd(); ++it) {
+            for (const auto service : services) {
                 qInfo().noquote() << QString::fromLatin1("      KNXnet/IP %1, Version: %2")
-                    .arg(familieToString(it.key())).arg(it.value());
+                    .arg(familieToString(service.ServiceFamily)).arg(service.ServiceFamilyVersion);
             }
             qInfo() << "";
         }
diff --git a/examples/knx/knxeditor/mainwindow.cpp b/examples/knx/knxeditor/mainwindow.cpp
index 2302522..6e1ee89 100644
--- a/examples/knx/knxeditor/mainwindow.cpp
+++ b/examples/knx/knxeditor/mainwindow.cpp
@@ -57,22 +57,22 @@
 
 Ui::MainWindow *MainWindow::s_ui { nullptr };
 
-static QString familieToString(QKnxNetIpServiceFamiliesDib::ServiceFamilieId id)
+static QString familieToString(QKnxNetIp::ServiceFamily id)
 {
     switch (id) {
-    case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::Core:
+    case QKnxNetIp::ServiceFamily::Core:
         return MainWindow::tr("Core");
-    case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::DeviceManagement:
+    case QKnxNetIp::ServiceFamily::DeviceManagement:
         return MainWindow::tr("Device Management");
-    case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::IpTunneling:
+    case QKnxNetIp::ServiceFamily::IpTunneling:
         return MainWindow::tr("Tunnel");
-    case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::IpRouting:
+    case QKnxNetIp::ServiceFamily::IpRouting:
         return MainWindow::tr("Routing");
-    case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::RemoteLogging:
+    case QKnxNetIp::ServiceFamily::RemoteLogging:
         return MainWindow::tr("Remote Logging");
-    case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::RemoteConfigAndDiagnosis:
+    case QKnxNetIp::ServiceFamily::RemoteConfigAndDiagnosis:
         return MainWindow::tr("Remote Configuration");
-    case QKnxNetIpServiceFamiliesDib::ServiceFamilieId::ObjectServer:
+    case QKnxNetIp::ServiceFamily::ObjectServer:
         return MainWindow::tr("Object Server");
     default:
         break;
@@ -191,11 +191,11 @@ void MainWindow::newServerSelected(int serverBoxIndex)
         .arg(info.controlEndpointAddress().toString()).arg(info.controlEndpointPort())
         .arg([&info]() -> QString {
             QString value;
-            auto services = info.supportedServices();
-            for (auto it = services.constBegin(); it != services.constEnd(); ++it) {
+            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(it.key())).arg(it.value())));
+                    .arg(tr("KNXnet/IP %1, Version: %2").arg(familieToString(service.ServiceFamily))
+                        .arg(service.ServiceFamilyVersion)));
             }
             return value;
         }())
@@ -249,10 +249,10 @@ void MainWindow::showServerAndServices(const QKnxNetIpServerInfo &info)
     ui->outputEdit->append(tr("Server's Port"));
     ui->outputEdit->append(QString::number(info.controlEndpointPort()));
     ui->outputEdit->append(tr("The following services are supported:"));
-    auto services = info.supportedServices();
-    for (auto it = std::begin(services); it != std::end(services); ++it) {
-        ui->outputEdit->append(tr("    KNXnet/IP %1, Version: %2").arg(familieToString(it.key()))
-            .arg(it.value()));
+    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));
     }
 
     ui->serverBox->addItem(tr("%1 (%2:%3)").arg(info.deviceName(), info.controlEndpointAddress()