Fix the behavior of the SRP classes and builders to match existing ones

Adapt auto-test and documentation to take that into account. Make the
mandatory bit set by default, cause that's how the spec recommends it.

Change-Id: I62362a7d455405292328f16bab2bcaddd648680a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>

1 files changed, 4 insertions, 5 deletions

diff --git a/examples/knx/discoverer/main.cpp b/examples/knx/discoverer/main.cpp
index 29a8da4..cce5a52 100644
--- a/examples/knx/discoverer/main.cpp
+++ b/examples/knx/discoverer/main.cpp
@@ -154,14 +154,14 @@ int main(int argc, char *argv[])
     if (parser.isSet("filterProg")) {
         agent.setDiscoveryMode(agent.discoveryMode()
             | QKnxNetIpServerDiscoveryAgent::DiscoveryMode::CoreV2);
-        agent.setExtendedSearchParameters({ SrpBuilders::ProgrammingMode().create() });
+        agent.setExtendedSearchParameters({ QKnxNetIpSrpProxy::programmingModeBuilder().create() });
     }
 
     if (parser.isSet("filterMAC")) {
         agent.setDiscoveryMode(agent.discoveryMode()
             | QKnxNetIpServerDiscoveryAgent::DiscoveryMode::CoreV2);
         agent.setExtendedSearchParameters(QVector<QKnxNetIpSrp>({
-            SrpBuilders::MacAddress()
+            QKnxNetIpSrpProxy::macAddressBuilder()
                 .setMac(QKnxByteArray::fromHex(parser.value("filterMAC").toLatin1()))
                 .create()
         }) + agent.extendedSearchParameters());
@@ -179,9 +179,8 @@ int main(int argc, char *argv[])
                 | QKnxNetIpServerDiscoveryAgent::DiscoveryMode::CoreV2);
 
             agent.setExtendedSearchParameters(QVector<QKnxNetIpSrp>({
-                SrpBuilders::SupportedFamily()
-                    .setMandatory()
-                    .setServiceInfos({ { QKnxNetIp::ServiceFamily(left), right } })
+                QKnxNetIpSrpProxy::supportedFamilyBuilder()
+                    .setServiceInfo({ QKnxNetIp::ServiceFamily(left), right })
                     .create()
             }) + agent.extendedSearchParameters());
         }